label edit deadlock, build openexr cfg option, code cleanup

[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 094c9f415c4c9e62ab9224f37aa78cf07de3a5ab..9c6a9ab60da51c7e2cd7b60ba82ff2d5b72261fc 100644 (file)
--- a/cinelerra-5.1/cinelerra/labeledit.h
+++ b/cinelerra-5.1/cinelerra/labeledit.h
@@ -39,7 +39,7 @@ public:
        ~LabelEdit();
 
        BC_Window *new_gui();
        ~LabelEdit();
 
        BC_Window *new_gui();

-       void start(Label *label);
+       void start(Label *label, int x, int y);

        void handle_close_event(int result);
        void handle_done_event(int result);
 
        void handle_close_event(int result);
        void handle_done_event(int result);
 


@@ -49,13 +49,14 @@ public:
        VWindow *vwindow;
 
        Label *label;
        VWindow *vwindow;
 
        Label *label;

+       int x, y;

        LabelEditWindow *label_edit_window;
 };
 
 class LabelEditWindow : public BC_Window
 {
 public:
        LabelEditWindow *label_edit_window;
 };
 
 class LabelEditWindow : public BC_Window
 {
 public:

-       LabelEditWindow(MWindow *mwindow, LabelEdit *thread, int x, int y);
+       LabelEditWindow(MWindow *mwindow, LabelEdit *thread);

        ~LabelEditWindow();
 
        void create_objects();
        ~LabelEditWindow();
 
        void create_objects();