X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flabeledit.h;h=9c6a9ab60da51c7e2cd7b60ba82ff2d5b72261fc;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=9a9d04bb09b2d22440ef0e7dd36f0b94700dfd7a;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/labeledit.h b/cinelerra-5.1/cinelerra/labeledit.h
index 9a9d04bb..9c6a9ab6 100644
--- 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, int x, int y);
+	void handle_close_event(int result);
+	void handle_done_event(int result);
 
 // If it is being created or edited
 	MWindow *mwindow;
@@ -45,11 +49,10 @@ public:
 	VWindow *vwindow;
 
 	Label *label;
+	int x, y;
+	LabelEditWindow *label_edit_window;
 };
 
-
-
-
 class LabelEditWindow : public BC_Window
 {
 public:
@@ -58,15 +61,12 @@ public:
 
 	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 +75,6 @@ public:
 	LabelEditWindow *window;
 };
 
-
 class LabelEditComments : public BC_TextBox
 {
 public:
@@ -84,9 +83,4 @@ public:
 	LabelEditWindow *window;
 };
 
-
-
-
-
-
 #endif