awindowgui / mwindowedit / label rework

[goodguy/history.git] / cinelerra-5.1 / cinelerra / labeledit.h

diff --git a/cinelerra-5.1/cinelerra/labeledit.h b/cinelerra-5.1/cinelerra/labeledit.h
index 9a9d04bb09b2d22440ef0e7dd36f0b94700dfd7a..094c9f415c4c9e62ab9224f37aa78cf07de3a5ab 100644 (file)
--- a/cinelerra-5.1/cinelerra/labeledit.h
+++ b/cinelerra-5.1/cinelerra/labeledit.h
@@ -1,7 +1,7 @@
-
 /*
  * CINELERRA
  * Copyright (C) 2006 Pierre Dumuid
+ * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,22 +22,26 @@
 #ifndef LABELEDIT_H
 #define LABELEDIT_H
 
+#include "assetedit.inc"
+#include "assets.inc"
 #include "awindow.inc"
-#include "edl.inc"
+#include "awindowgui.inc"
 #include "guicast.h"
+#include "labeledit.inc"
 #include "mwindow.inc"
-#include "thread.h"
 #include "vwindow.inc"
 
 
-class LabelEdit : public Thread
+class LabelEdit : public BC_DialogThread
 {
 public:
        LabelEdit(MWindow *mwindow, AWindow *awindow, VWindow *vwindow);
        ~LabelEdit();
 
-       void run();
-       void edit_label(Label *label);
+       BC_Window *new_gui();
+       void start(Label *label);
+       void handle_close_event(int result);
+       void handle_done_event(int result);
 
 // If it is being created or edited
        MWindow *mwindow;
@@ -45,28 +49,23 @@ public:
        VWindow *vwindow;
 
        Label *label;
+       LabelEditWindow *label_edit_window;
 };
 
-
-
-
 class LabelEditWindow : public BC_Window
 {
 public:
-       LabelEditWindow(MWindow *mwindow, LabelEdit *thread);
+       LabelEditWindow(MWindow *mwindow, LabelEdit *thread, int x, int y);
        ~LabelEditWindow();
 
        void create_objects();
 
-
 // Use this copy of the pointer in LabelEdit since multiple windows are possible
        Label *label;
        MWindow *mwindow;
        LabelEdit *thread;
 };
 
-
-
 class LabelEditTitle : public BC_TextBox
 {
 public:
@@ -75,7 +74,6 @@ public:
        LabelEditWindow *window;
 };
 
-
 class LabelEditComments : public BC_TextBox
 {
 public:
@@ -84,9 +82,4 @@ public:
        LabelEditWindow *window;
 };
 
-
-
-
-
-
 #endif