diff -rc fltk-1.3.x-r6700/FL/Enumerations.H fltk-1.3.x-r6700-patched/FL/Enumerations.H *** fltk-1.3.x-r6700/FL/Enumerations.H 2009-03-16 18:38:32.000000000 -0400 --- fltk-1.3.x-r6700-patched/FL/Enumerations.H 2009-03-22 10:19:54.000000000 -0400 *************** *** 482,487 **** --- 482,495 ---- _FL_GTK_THIN_DOWN_FRAME, ///< gtk+ version of FL_THIN_DOWN_FRAME _FL_GTK_ROUND_UP_BOX, ///< gtk+ version of FL_ROUND_UP_BOX _FL_GTK_ROUND_DOWN_BOX, ///< gtk+ version of FL_ROUND_DOWN_BOX + _FL_GLEAM_UP_BOX, + _FL_GLEAM_DOWN_BOX, + _FL_GLEAM_UP_FRAME, + _FL_GLEAM_DOWN_FRAME, + _FL_GLEAM_THIN_UP_BOX, + _FL_GLEAM_THIN_DOWN_BOX, + _FL_GLEAM_ROUND_UP_BOX, + _FL_GLEAM_ROUND_DOWN_BOX, FL_FREE_BOXTYPE ///< the first free box type for creation of new box types }; extern FL_EXPORT Fl_Boxtype fl_define_FL_ROUND_UP_BOX(); *************** *** 528,533 **** --- 536,551 ---- #define FL_GTK_ROUND_UP_BOX (Fl_Boxtype)(fl_define_FL_GTK_UP_BOX()+8) #define FL_GTK_ROUND_DOWN_BOX (Fl_Boxtype)(fl_define_FL_GTK_UP_BOX()+9) + extern FL_EXPORT Fl_Boxtype fl_define_FL_GLEAM_UP_BOX(); + #define FL_GLEAM_UP_BOX fl_define_FL_GLEAM_UP_BOX() + #define FL_GLEAM_DOWN_BOX (Fl_Boxtype)(fl_define_FL_GLEAM_UP_BOX()+1) + #define FL_GLEAM_UP_FRAME (Fl_Boxtype)(fl_define_FL_GLEAM_UP_BOX()+2) + #define FL_GLEAM_DOWN_FRAME (Fl_Boxtype)(fl_define_FL_GLEAM_UP_BOX()+3) + #define FL_GLEAM_THIN_UP_BOX (Fl_Boxtype)(fl_define_FL_GLEAM_UP_BOX()+4) + #define FL_GLEAM_THIN_DOWN_BOX (Fl_Boxtype)(fl_define_FL_GLEAM_UP_BOX()+5) + #define FL_GLEAM_ROUND_UP_BOX (Fl_Boxtype)(fl_define_FL_GLEAM_UP_BOX()+6) + #define FL_GLEAM_ROUND_DOWN_BOX (Fl_Boxtype)(fl_define_FL_GLEAM_UP_BOX()+7) + // conversions of box types to other boxtypes: /** Get the filled version of a frame. diff -rc fltk-1.3.x-r6700/fluid/alignment_panel.cxx fltk-1.3.x-r6700-patched/fluid/alignment_panel.cxx *** fltk-1.3.x-r6700/fluid/alignment_panel.cxx 2009-01-01 11:11:32.000000000 -0500 --- fltk-1.3.x-r6700-patched/fluid/alignment_panel.cxx 2009-03-22 10:20:29.000000000 -0400 *************** *** 181,186 **** --- 181,187 ---- {"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 -rc fltk-1.3.x-r6700/fluid/alignment_panel.fl fltk-1.3.x-r6700-patched/fluid/alignment_panel.fl *** fltk-1.3.x-r6700/fluid/alignment_panel.fl 2009-01-01 11:11:32.000000000 -0500 --- fltk-1.3.x-r6700-patched/fluid/alignment_panel.fl 2009-03-22 10:20:50.000000000 -0400 *************** *** 183,188 **** --- 183,192 ---- label {GTK+} xywh {10 10 35 25} } + MenuItem {} { + label {Gleam} + xywh {20 20 35 25} + } } Fl_Group {} { label {Options: diff -rc fltk-1.3.x-r6700/fluid/fluid.cxx fltk-1.3.x-r6700-patched/fluid/fluid.cxx *** fltk-1.3.x-r6700/fluid/fluid.cxx 2009-01-20 03:47:18.000000000 -0500 --- fltk-1.3.x-r6700-patched/fluid/fluid.cxx 2009-03-22 10:21:23.000000000 -0400 *************** *** 1689,1694 **** --- 1689,1697 ---- case 3 : // GTK+ Fl::scheme("gtk+"); break; + case 4 : // Gleam + Fl::scheme("gleam"); + break; } fluid_prefs.set("scheme", scheme_choice->value()); diff -rc fltk-1.3.x-r6700/fluid/Fl_Widget_Type.cxx fltk-1.3.x-r6700-patched/fluid/Fl_Widget_Type.cxx *** fltk-1.3.x-r6700/fluid/Fl_Widget_Type.cxx 2009-01-03 10:44:06.000000000 -0500 --- fltk-1.3.x-r6700-patched/fluid/Fl_Widget_Type.cxx 2009-03-22 10:22:12.000000000 -0400 *************** *** 673,678 **** --- 673,684 ---- {"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}, *************** *** 691,696 **** --- 697,704 ---- {"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 -rc fltk-1.3.x-r6700/src/fl_boxtype.cxx fltk-1.3.x-r6700-patched/src/fl_boxtype.cxx *** fltk-1.3.x-r6700/src/fl_boxtype.cxx 2009-01-01 16:28:26.000000000 -0500 --- fltk-1.3.x-r6700-patched/src/fl_boxtype.cxx 2009-03-22 10:23:11.000000000 -0400 *************** *** 302,307 **** --- 302,315 ---- {fl_down_box, 1,1,2,2,0}, // _FL_GTK_THIN_ROUND_DOWN_BOX, {fl_up_box, 2,2,4,4,0}, // _FL_GTK_ROUND_UP_BOX, {fl_down_box, 2,2,4,4,0}, // _FL_GTK_ROUND_DOWN_BOX, + {fl_up_box, 2,2,3,3,0}, // _FL_GLEAM_UP_BOX, + {fl_down_box, 2,2,3,3,0}, // _FL_GLEAM_DOWN_BOX, + {fl_up_frame, 2,2,3,3,0}, // _FL_GLEAM_UP_FRAME, + {fl_down_frame, 2,2,3,3,0}, // _FL_GLEAM_DOWN_FRAME, + {fl_up_box, 1,1,1,1,0}, // _FL_GLEAM_THIN_UP_BOX, + {fl_down_box, 1,1,1,1,0}, // _FL_GLEAM_THIN_DOWN_BOX, + {fl_up_box, 2,2,3,3,0}, // _FL_GLEAM_ROUND_UP_BOX, + {fl_down_box, 2,2,3,3,0}, // _FL_GLEAM_ROUND_DOWN_BOX, {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+0 {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+1 {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+2 diff -rc fltk-1.3.x-r6700/src/Fl_get_system_colors.cxx fltk-1.3.x-r6700-patched/src/Fl_get_system_colors.cxx *** fltk-1.3.x-r6700/src/Fl_get_system_colors.cxx 2009-01-01 16:28:26.000000000 -0500 --- fltk-1.3.x-r6700-patched/src/Fl_get_system_colors.cxx 2009-03-22 10:24:55.000000000 -0400 *************** *** 240,247 **** if (!key1) key1 = "fltk"; if (!fl_bg2_set) getsyscolor("Text","background", fl_bg2, "#ffffff", Fl::background2); if (!fl_fg_set) getsyscolor(key1, "foreground", fl_fg, "#000000", Fl::foreground); ! if (!fl_bg_set) getsyscolor(key1, "background", fl_bg, "#c0c0c0", Fl::background); ! getsyscolor("Text", "selectBackground", 0, "#000080", set_selection_color); } #endif --- 240,247 ---- if (!key1) key1 = "fltk"; if (!fl_bg2_set) getsyscolor("Text","background", fl_bg2, "#ffffff", Fl::background2); if (!fl_fg_set) getsyscolor(key1, "foreground", fl_fg, "#000000", Fl::foreground); ! if (!fl_bg_set) getsyscolor(key1, "background", fl_bg, "#e4e4e4", Fl::background); ! getsyscolor("Text", "selectBackground", 0, "#3465a4", set_selection_color); } #endif *************** *** 390,395 **** --- 390,418 ---- // Use slightly thinner scrollbars... Fl::scrollbar_size(15); + + } else if (scheme_ && !strcasecmp(scheme_, "gleam")) { + // Use a Gleam look-and-feel, similar to Clearlooks Glossy, made by Colin Jones + if (scheme_bg_) { + delete scheme_bg_; + scheme_bg_ = (Fl_Image *)0; + } + + set_boxtype(FL_UP_FRAME, FL_GLEAM_UP_FRAME); + set_boxtype(FL_DOWN_FRAME, FL_GLEAM_DOWN_FRAME); + set_boxtype(FL_THIN_UP_FRAME, FL_GLEAM_UP_FRAME); + set_boxtype(FL_THIN_DOWN_FRAME, FL_GLEAM_DOWN_FRAME); + + set_boxtype(FL_UP_BOX, FL_GLEAM_UP_BOX); + set_boxtype(FL_DOWN_BOX, FL_GLEAM_DOWN_BOX); + set_boxtype(FL_THIN_UP_BOX, FL_GLEAM_THIN_UP_BOX); + set_boxtype(FL_THIN_DOWN_BOX, FL_GLEAM_THIN_DOWN_BOX); + set_boxtype(_FL_ROUND_UP_BOX, FL_GLEAM_ROUND_UP_BOX); + set_boxtype(_FL_ROUND_DOWN_BOX, FL_GLEAM_ROUND_DOWN_BOX); + + // Use slightly thinner scrollbars... + Fl::scrollbar_size(10); + } else { // Use the standard FLTK look-n-feel... if (scheme_bg_) { Only in fltk-1.3.x-r6700-patched/src: fl_gleam.cxx diff -rc fltk-1.3.x-r6700/src/makedepend fltk-1.3.x-r6700-patched/src/makedepend *** fltk-1.3.x-r6700/src/makedepend 2007-02-10 09:31:12.000000000 -0500 --- fltk-1.3.x-r6700-patched/src/makedepend 2009-03-22 10:25:30.000000000 -0400 *************** *** 381,386 **** --- 381,389 ---- ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_draw.H \ ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H \ Fl_Font.H fl_font_xft.cxx + fl_gleam.o: fl_gleam.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/fl_draw.H flstring.h ../FL/Fl_Export.H \ + ../config.h fl_gtk.o: fl_gtk.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H \ ../FL/fl_draw.H fl_labeltype.o: fl_labeltype.cxx ../FL/Fl.H ../FL/Enumerations.H \ diff -rc fltk-1.3.x-r6700/src/Makefile fltk-1.3.x-r6700-patched/src/Makefile *** fltk-1.3.x-r6700/src/Makefile 2009-02-14 09:34:32.000000000 -0500 --- fltk-1.3.x-r6700-patched/src/Makefile 2009-03-22 10:25:53.000000000 -0400 *************** *** 133,138 **** --- 133,139 ---- fl_engraved_label.cxx \ fl_file_dir.cxx \ fl_font.cxx \ + fl_gleam.cxx \ fl_gtk.cxx \ fl_labeltype.cxx \ fl_line_style.cxx \