diff options
| author | Matthias Melcher <git@matthiasm.com> | 2021-12-05 00:18:41 +0100 |
|---|---|---|
| committer | Matthias Melcher <git@matthiasm.com> | 2021-12-05 00:18:41 +0100 |
| commit | 204ac3dfdfd519607e2f392fa83c12fad9e73fde (patch) | |
| tree | a257c0fca4f44342d1df13764fbead7bf937af72 /fluid | |
| parent | 21a75a18f8fee47be196289932d564e58216d358 (diff) | |
Fluid: adapting menu to pixmap changes.
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/factory.cxx | 8 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fluid/factory.cxx b/fluid/factory.cxx index 72ad7737c..ecbecef90 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -1011,7 +1011,6 @@ Fl_Menu_Item New_Menu[] = { {0,0,cb,(void*)&Fl_Pack_type}, {0,0,cb,(void*)&Fl_Tabs_type}, {0,0,cb,(void*)&Fl_Scroll_type}, - {0,0,cb,(void*)&Fl_Table_type}, {0,0,cb,(void*)&Fl_Tile_type}, {0,0,cb,(void*)&Fl_Wizard_type}, {0}, @@ -1036,11 +1035,11 @@ Fl_Menu_Item New_Menu[] = { {0,0,cb,(void*)&Fl_Value_Output_type}, {0}, {"Text",0,0,0,FL_SUBMENU}, - {0,0,cb,(void*)&Fl_File_Input_type}, {0,0,cb,(void*)&Fl_Input_type}, {0,0,cb,(void*)&Fl_Output_type}, - {0,0,cb,(void*)&Fl_Text_Display_type}, {0,0,cb,(void*)&Fl_Text_Editor_type}, + {0,0,cb,(void*)&Fl_Text_Display_type}, + {0,0,cb,(void*)&Fl_File_Input_type}, {0,0,cb,(void*)&Fl_Simple_Terminal_type}, {0}, {"Menus",0,0,0,FL_SUBMENU}, @@ -1058,11 +1057,12 @@ Fl_Menu_Item New_Menu[] = { {0,0,cb,(void*)&Fl_Check_Browser_type}, {0,0,cb,(void*)&Fl_File_Browser_type}, {0,0,cb,(void*)&Fl_Tree_type}, + {0,0,cb,(void*)&Fl_Help_View_type}, + {0,0,cb,(void*)&Fl_Table_type}, {0}, {"Other",0,0,0,FL_SUBMENU}, {0,0,cb,(void*)&Fl_Box_type}, {0,0,cb,(void*)&Fl_Clock_type}, - {0,0,cb,(void*)&Fl_Help_View_type}, {0,0,cb,(void*)&Fl_Progress_type}, {0}, {0}}; diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 541068448..49944e5ba 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1210,6 +1210,7 @@ void make_main_window() { if (!main_window) { Fl_Widget *o; + loadPixmaps(); main_window = new Fl_Double_Window(WINWIDTH,WINHEIGHT,"fluid"); main_window->box(FL_NO_BOX); o = make_widget_browser(0,MENUHEIGHT,BROWSERWIDTH,BROWSERHEIGHT); @@ -1792,7 +1793,6 @@ int main(int argc,char **argv) { #endif // __APPLE__ Fl::visual((Fl_Mode)(FL_DOUBLE|FL_INDEX)); Fl_File_Icon::load_system_icons(); - loadPixmaps(); main_window->callback(exit_cb); position_window(main_window,"main_window_pos", 1, 10, 30, WINWIDTH, WINHEIGHT ); main_window->show(argc,argv); |