projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add shell menu btns, add manual
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
mwindowgui.C
diff --git
a/cinelerra-5.0/cinelerra/mwindowgui.C
b/cinelerra-5.0/cinelerra/mwindowgui.C
index 13f7247524dd3db92a2e7ae1a4a8b6954d692f18..882fe8264dd0a68970368efc6deaf00c2fe3be86 100644
(file)
--- a/
cinelerra-5.0/cinelerra/mwindowgui.C
+++ b/
cinelerra-5.0/cinelerra/mwindowgui.C
@@
-58,8
+58,9
@@
#include "renderengine.h"
#include "resourcethread.h"
#include "samplescroll.h"
#include "renderengine.h"
#include "resourcethread.h"
#include "samplescroll.h"
-#include "s
window
.h"
+#include "s
hbtnprefs
.h"
#include "statusbar.h"
#include "statusbar.h"
+#include "swindow.h"
#include "theme.h"
#include "trackcanvas.h"
#include "trackscroll.h"
#include "theme.h"
#include "trackcanvas.h"
#include "trackscroll.h"
@@
-258,7
+259,10
@@
void MWindowGUI::create_objects()
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
- add_subwindow(mainmenu = new MainMenu(mwindow, this));
+ int x = get_w() - MainShBtns::calculate_w(1);
+ add_subwindow(mainmenu = new MainMenu(mwindow, this, x));
+ add_subwindow(mainshbtns = new MainShBtns(mwindow, x, 0));
+ mainshbtns->load(mwindow->preferences);
mwindow->theme->get_mwindow_sizes(this, get_w(), get_h());
mwindow->theme->draw_mwindow_bg(this);
mainmenu->create_objects();
mwindow->theme->get_mwindow_sizes(this, get_w(), get_h());
mwindow->theme->draw_mwindow_bg(this);
mainmenu->create_objects();