X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.h;h=68e0a4f7707fcab015a1029b6b04a5db459a77a4;hp=ee920186dd8fc3787edabd103b6fc6cb1c696423;hb=abf5c6bb4dec2c2d03df2872e1d337e3905b3619;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h index ee920186..68e0a4f7 100644 --- 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(); @@ -161,7 +164,7 @@ public: int menu_w(); int menu_h(); // Draw on the status bar only. - void show_message(const char *message, int color=-1); + void show_message(const char *message, int msg_color=-1, int box_color=-1); void update_default_message(); void reset_default_message(); void default_message(); @@ -210,6 +213,7 @@ public: DbWindow *db_window; SWindow *swindow; // Popup menus + TrackPopup *track_menu; EditPopup *edit_menu; PluginPopup *plugin_menu; KeyframePopup *keyframe_menu;