X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flabeledit.h;h=80bf1f127e350f7254b196af5bedb6aa87a13d95;hp=83e72ffef37975404b5244748f8e99d6af021d95;hb=HEAD;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/labeledit.h b/cinelerra-5.1/cinelerra/labeledit.h
index 83e72ffe..80bf1f12 100644
--- a/cinelerra-5.1/cinelerra/labeledit.h
+++ b/cinelerra-5.1/cinelerra/labeledit.h
@@ -1,43 +1,47 @@
-
 /*
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #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;
+	BC_TextBox *textbox;
 };
 
-
-
 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