diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-12-20 22:19:24 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-12-20 22:19:24 +0000 |
| commit | a8e883155958ae8a7ea9087682da42411d46d3d9 (patch) | |
| tree | 0d1d3b7e19056a6b1e75e12ff5d8d57674b506cf /fluid/fluid.cxx | |
| parent | 3b65b1b3bfc5c49bf5d843f30bfd60df03c71ddb (diff) | |
Moved global FLTK options into Fluid until we find a better setup. Restored the original Preferences demo.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8089 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/fluid.cxx')
| -rw-r--r-- | fluid/fluid.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 767a5dce9..064156241 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -835,6 +835,7 @@ static void sort_cb(Fl_Widget *,void *) { void show_project_cb(Fl_Widget *, void *); void show_grid_cb(Fl_Widget *, void *); void show_settings_cb(Fl_Widget *, void *); +void show_global_settings_cb(Fl_Widget *, void *); void align_widget_cb(Fl_Widget *, long); void widget_size_cb(Fl_Widget *, long); @@ -1630,7 +1631,8 @@ Fl_Menu_Item Main_Menu[] = { {"Show Widget &Bin...",FL_ALT+'b',toggle_widgetbin_cb}, {"Show Source Code...",FL_ALT+FL_SHIFT+'s', (Fl_Callback*)toggle_sourceview_cb, 0, FL_MENU_DIVIDER}, {"Pro&ject Settings...",FL_ALT+'p',show_project_cb}, - {"GU&I Settings...",FL_ALT+FL_SHIFT+'p',show_settings_cb}, + {"GU&I Settings...",FL_ALT+FL_SHIFT+'p',show_settings_cb,0,FL_MENU_DIVIDER}, + {"Global &FLTK Settings...",FL_ALT+FL_SHIFT+'g',show_global_settings_cb}, {0}, {"&New", 0, 0, (void *)New_Menu, FL_SUBMENU_POINTER}, {"&Layout",0,0,0,FL_SUBMENU}, @@ -1788,6 +1790,7 @@ void make_main_window() { if (!compile_only) { load_history(); make_settings_window(); + make_global_settings_window(); } } |