projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add crop plugin, add timeline bars, render setup err chks, minor tweaks
[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 6484dc8184c1927982ad1d32ecf4ba806e380e88..68e0a4f7707fcab015a1029b6b04a5db459a77a4 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 "timelinepane.inc"
#include "track.inc"
#include "trackcanvas.inc"
+#include "trackpopup.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
#include "zoombar.inc"
#include "trackscroll.inc"
#include "transitionpopup.inc"
#include "zoombar.inc"
@@
-163,7
+164,7
@@
public:
int menu_w();
int menu_h();
// Draw on the status bar only.
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();
void update_default_message();
void reset_default_message();
void default_message();
@@
-212,6
+213,7
@@
public:
DbWindow *db_window;
SWindow *swindow;
// Popup menus
DbWindow *db_window;
SWindow *swindow;
// Popup menus
+ TrackPopup *track_menu;
EditPopup *edit_menu;
PluginPopup *plugin_menu;
KeyframePopup *keyframe_menu;
EditPopup *edit_menu;
PluginPopup *plugin_menu;
KeyframePopup *keyframe_menu;