STR #1052: Updated FLUID to generate buttons in the correct colors. After all these changes, it may be useful to rebuild all cxx files from fl files. This will make sure that menu items are rendered in foreground color instead of simply black

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4625 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

fluid/about_panel.cxx

@@ -262,46 +262,41 @@ static const char *idata_fluid[] = {
 };
 static Fl_Pixmap image_fluid(idata_fluid);
 
-static void cb_Close(Fl_Return_Button* o, void*) {
-  ((Fl_Window*)(o->parent()))->hide();
-}
-
 static void cb_View(Fl_Button*, void*) {
   show_help("license.html");
 }
 
+static void cb_Close(Fl_Return_Button* o, void*) {
+  ((Fl_Window*)(o->parent()))->hide();
+}
+
 Fl_Double_Window* make_about_panel() {
   Fl_Double_Window* w;
-  { Fl_Double_Window* o = about_panel = new Fl_Double_Window(350, 195, "About FLUID");
+  { Fl_Double_Window* o = about_panel = new Fl_Double_Window(315, 175, "About FLUID");
     w = o;
     o->color(FL_LIGHT1);
     o->selection_color(FL_DARK1);
     w->hotspot(o);
-    { Fl_Group* o = new Fl_Group(10, 10, 330, 141);
-      o->box(FL_THIN_UP_BOX);
-      { Fl_Box* o = new Fl_Box(20, 20, 116, 121);
+    { Fl_Box* o = new Fl_Box(10, 10, 115, 120);
       o->image(image_fluid);
     }
-      { Fl_Box* o = new Fl_Box(146, 20, 184, 69, "FLTK User\nInterface Designer\nVersion 1.1.7");
+    { Fl_Box* o = new Fl_Box(135, 10, 170, 69, "FLTK User\nInterface Designer\nVersion 1.1.7");
       o->color((Fl_Color)12);
       o->selection_color(FL_DARK1);
       o->labelfont(1);
       o->labelsize(18);
-        o->labelcolor(FL_FOREGROUND_COLOR);
       o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
     }
-      { Fl_Box* o = new Fl_Box(146, 99, 184, 42, "Copyright 1998-2005 by\nBill Spitzak and others");
+    { Fl_Box* o = new Fl_Box(135, 89, 170, 42, "Copyright 1998-2005 by\nBill Spitzak and others");
       o->align(132|FL_ALIGN_INSIDE);
     }
-      o->end();
-    }
-    { Fl_Return_Button* o = new Fl_Return_Button(271, 161, 69, 25, "Close");
-      o->callback((Fl_Callback*)cb_Close);
-    }
-    { Fl_Button* o = new Fl_Button(146, 161, 115, 25, "View License...");
+    { Fl_Button* o = new Fl_Button(89, 141, 123, 25, "View License...");
       o->labelcolor(FL_DARK_BLUE);
       o->callback((Fl_Callback*)cb_View);
     }
+    { Fl_Return_Button* o = new Fl_Return_Button(222, 141, 83, 25, "Close");
+      o->callback((Fl_Callback*)cb_Close);
+    }
     o->set_non_modal();
     o->end();
   }

fluid/about_panel.h

@@ -33,10 +33,9 @@
 extern void show_help(const char *name);
 #include <FL/Fl_Double_Window.H>
 extern Fl_Double_Window *about_panel;
-#include <FL/Fl_Group.H>
 #include <FL/Fl_Box.H>
-#include <FL/Fl_Return_Button.H>
 #include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
 Fl_Double_Window* make_about_panel();
 #endif
 

fluid/alignment_panel.cxx

@@ -44,9 +44,9 @@ Fl_Light_Button *include_H_from_C_button=(Fl_Light_Button *)0;
 Fl_Choice *i18n_type_chooser=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_i18n_type_chooser[] = {
- {"None", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 56},
- {"GNU gettext", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 56},
- {"POSIX catgets", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 56},
+ {"None", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"GNU gettext", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
+ {"POSIX catgets", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -171,9 +171,9 @@ Fl_Double_Window *settings_window=(Fl_Double_Window *)0;
 Fl_Choice *scheme_choice=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_scheme_choice[] = {
- {"Default", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 56},
- {"None", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 56},
- {"Plastic", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 56},
+ {"Default", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"None", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"Plastic", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 

fluid/function_panel.cxx

@@ -130,7 +130,7 @@ Fl_Double_Window* make_code_panel() {
       o->labeltype(FL_NORMAL_LABEL);
       o->labelfont(0);
       o->labelsize(11);
-      o->labelcolor(FL_BLACK);
+      o->labelcolor(FL_FOREGROUND_COLOR);
       o->textfont(4);
       o->textsize(11);
       o->align(FL_ALIGN_TOP);
@@ -432,7 +432,7 @@ Fl_Double_Window* make_comment_panel() {
       o->labeltype(FL_NORMAL_LABEL);
       o->labelfont(0);
       o->labelsize(11);
-      o->labelcolor(FL_BLACK);
+      o->labelcolor(FL_FOREGROUND_COLOR);
       o->textfont(4);
       o->textsize(11);
       o->align(FL_ALIGN_TOP);

fluid/print_panel.cxx

@@ -117,8 +117,8 @@ print_update_status();
 Fl_Choice *print_page_size=(Fl_Choice *)0;
 
 Fl_Menu_Item menu_print_page_size[] = {
- {"Letter", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 56},
- {"A4", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 56},
+ {"Letter", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"A4", 0,  0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 

fluid/widget_panel.cxx

@@ -362,7 +362,7 @@ ive to the origin at construction time");
           o->labeltype(FL_NORMAL_LABEL);
           o->labelfont(1);
           o->labelsize(11);
-          o->labelcolor(FL_BLACK);
+          o->labelcolor(FL_FOREGROUND_COLOR);
           o->callback((Fl_Callback*)shortcut_in_cb);
           o->align(FL_ALIGN_LEFT);
           o->when(FL_WHEN_RELEASE);
@@ -657,7 +657,7 @@ access the Widget pointer and \'v\' to access the user value.");
           o->labeltype(FL_NORMAL_LABEL);
           o->labelfont(1);
           o->labelsize(11);
-          o->labelcolor(FL_BLACK);
+          o->labelcolor(FL_FOREGROUND_COLOR);
           o->textfont(4);
           o->textsize(11);
           o->callback((Fl_Callback*)callback_cb);
@@ -749,7 +749,6 @@ access the Widget pointer and \'v\' to access the user value.");
 avior.");
         o->type(1);
         o->labelsize(11);
-        o->labelcolor(FL_FOREGROUND_COLOR);
         o->callback((Fl_Callback*)live_mode_cb);
       }
       o->end();

fluid/widget_panel.fl

@@ -43,7 +43,7 @@ Function {make_widget_panel()} {open
     } {
       Fl_Group {} {
         label GUI
-        callback propagate_load selected
+        callback propagate_load
         xywh {5 25 400 290} labelsize 11 when 0 resizable
       } {
         Fl_Group {} {
@@ -106,7 +106,7 @@ Function {make_widget_panel()} {open
           Fl_Button {} {
             label Wrap
             user_data FL_ALIGN_WRAP
-            callback align_cb
+            callback align_cb selected
             tooltip {Wrap the label text.} xywh {140 110 50 20} type Toggle selection_color 8 labelsize 11
           }
           Fl_Button {} {
@@ -536,7 +536,7 @@ Function {make_widget_panel()} {open
       Fl_Button wLiveMode {
         label {Live &Mode}
         callback live_mode_cb
-        tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {142 325 84 20} type Toggle labelsize 11 labelcolor 0
+        tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {142 325 84 20} type Toggle labelsize 11
       }
     }
   }