X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmwindowgui.C;h=882fe8264dd0a68970368efc6deaf00c2fe3be86;hp=13f7247524dd3db92a2e7ae1a4a8b6954d692f18;hb=8596efc40093b9581099e7c72d8be3857e390242;hpb=058cf29dcce79444cb57da22ae03d9f2abff745e diff --git a/cinelerra-5.0/cinelerra/mwindowgui.C b/cinelerra-5.0/cinelerra/mwindowgui.C index 13f72475..882fe826 100644 --- 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 "swindow.h" +#include "shbtnprefs.h" #include "statusbar.h" +#include "swindow.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__); - 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();