diff options
| author | Greg Ercolano <erco@seriss.com> | 2014-02-25 04:24:41 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2014-02-25 04:24:41 +0000 |
| commit | c5d5ba1cf524f4da930bfd4bd77ba044ecf96e54 (patch) | |
| tree | c2f55edf5335021dad2696a290a11a49d4982780 /fluid | |
| parent | de7a79afd6231bb1f39c3b3c3a34364da560dfe2 (diff) | |
Applying the etorres gleam patch. STR #2672.
TODO: Xcode 4 ide needs fl_gleam.cxx added
Test of Visual Studio IDE mods (which were hand-modified)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Fl_Widget_Type.cxx | 8 | ||||
| -rw-r--r-- | fluid/alignment_panel.cxx | 1 | ||||
| -rw-r--r-- | fluid/alignment_panel.fl | 4 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 3 |
4 files changed, 16 insertions, 0 deletions
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index 397d56ae8..4bcad63f9 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -678,6 +678,12 @@ Fl_Menu_Item boxmenu[] = { {"GTK_THIN_DOWN_BOX",0,0,(void *)FL_GTK_THIN_DOWN_BOX}, {"GTK_ROUND_UP_BOX",0,0,(void *)FL_GTK_ROUND_UP_BOX}, {"GTK_ROUND_DOWN_BOX",0,0,(void *)FL_GTK_ROUND_DOWN_BOX}, +{"GLEAM_UP_BOX",0,0,(void *)FL_GLEAM_UP_BOX}, +{"GLEAM_DOWN_BOX",0,0,(void *)FL_GLEAM_DOWN_BOX}, +{"GLEAM_THIN_UP_BOX",0,0,(void *)FL_GLEAM_THIN_UP_BOX}, +{"GLEAM_THIN_DOWN_BOX",0,0,(void *)FL_GLEAM_THIN_DOWN_BOX}, +{"GLEAM_ROUND_UP_BOX",0,0,(void *)FL_GLEAM_ROUND_UP_BOX}, +{"GLEAM_ROUND_DOWN_BOX",0,0,(void *)FL_GLEAM_ROUND_DOWN_BOX}, {0}, {"frames",0,0,0,FL_SUBMENU}, {"UP_FRAME",0,0,(void *)FL_UP_FRAME}, @@ -696,6 +702,8 @@ Fl_Menu_Item boxmenu[] = { {"GTK_DOWN_FRAME",0,0,(void *)FL_GTK_DOWN_FRAME}, {"GTK_THIN_UP_FRAME",0,0,(void *)FL_GTK_THIN_UP_FRAME}, {"GTK_THIN_DOWN_FRAME",0,0,(void *)FL_GTK_THIN_DOWN_FRAME}, +{"GLEAM_UP_FRAME",0,0,(void *)FL_GLEAM_UP_FRAME}, +{"GLEAM_DOWN_FRAME",0,0,(void *)FL_GLEAM_DOWN_FRAME}, {0}, {0}}; diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx index 1fa45d810..50e6b2381 100644 --- a/fluid/alignment_panel.cxx +++ b/fluid/alignment_panel.cxx @@ -153,6 +153,7 @@ Fl_Menu_Item menu_scheme_choice[] = { {"None", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, {"Plastic", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, {"GTK+", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, + {"Gleam", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, {0,0,0,0,0,0,0,0,0} }; diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl index 6027f4ea2..548e02685 100644 --- a/fluid/alignment_panel.fl +++ b/fluid/alignment_panel.fl @@ -187,6 +187,10 @@ Function {make_settings_window()} {} { label {GTK+} xywh {10 10 35 25} } + MenuItem {} { + label {Gleam} + xywh {20 20 35 25} + } } Fl_Group {} {open xywh {116 43 220 126} labelfont 1 align 0 diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 2cbe96756..d0f1adc33 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1113,6 +1113,9 @@ void scheme_cb(Fl_Choice *, void *) { case 3 : // GTK+ Fl::scheme("gtk+"); break; + case 4 : // Gleam + Fl::scheme("gleam"); + break; } fluid_prefs.set("scheme", scheme_choice->value()); |