inter-view map only if armed track, copy/paste behavior rework

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / mwindowgui.h

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h
index ee920186dd8fc3787edabd103b6fc6cb1c696423..592e38767f674270337fdabf3d157d900a743cc8 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.h
+++ b/cinelerra-5.1/cinelerra/mwindowgui.h
@@ -53,6 +53,7 @@
 #include "timelinepane.inc"
 #include "track.inc"
 #include "trackcanvas.inc"
+#include "trackpopup.inc"
 #include "trackscroll.inc"
 #include "transitionpopup.inc"
 #include "zoombar.inc"
@@ -111,9 +112,11 @@ public:
        int focus_in_event();
        int focus_out_event();
 
-// do_canvas - 1 for incremental drawing of resources
-//          FORCE_REDRAW for delete and redraw of resources
-//          IGNORE_THREAD to ignore picon thread
+// do_canvas -
+//   NO_DRAW disable canvas draw
+//   IGNORE_THREAD to ignore picon thread
+//   NORMAL_DRAW for incremental drawing of resources
+//   FORCE_REDRAW for delete and redraw of resources
        void update(int scrollbars,
                int do_canvas,
                int timebar,
@@ -130,7 +133,7 @@ public:
        void update_proxy_toggle();
        void update_plugintoggles();
        void update_scrollbars(int flush);
-       void draw_canvas(int mode, int hide_cursor);
+       void draw_canvas(int redraw, int hide_cursor);
        void flash_canvas(int flush);
        int show_window(int flush=1);
        void deactivate_timeline();
@@ -210,6 +213,7 @@ public:
        DbWindow *db_window;
        SWindow *swindow;
 // Popup menus
+       TrackPopup *track_menu;
        EditPopup *edit_menu;
        PluginPopup *plugin_menu;
        KeyframePopup *keyframe_menu;