Widget panel update with tabs (a la 2.0) with new tooltip, image, and

position/size widgets.


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

1 files changed, 344 insertions, 295 deletions

diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 8a9612a3d..b0d825284 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -1,325 +1,374 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0008
+// generated by Fast Light User Interface Designer (fluid) version 1.0100
 
 #include "widget_panel.h"
 
+static void cb_(Fl_Tabs* o, void* v) {
+  propagate_load((Fl_Group *)o,v);
+}
+
 Fl_Input *v_input[4]={(Fl_Input *)0};
 
 Fl_Window* make_widget_panel() {
   Fl_Window* w;
-  { Fl_Window* o = new Fl_Window(370, 485);
+  { Fl_Window* o = new Fl_Window(415, 370);
     w = o;
     w->hotspot(o);
-    { Fl_Input* o = new Fl_Input(90, 10, 210, 20, "Name:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)name_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Light_Button* o = new Fl_Light_Button(300, 10, 60, 20, "public");
-      o->box(FL_THIN_UP_BOX);
-      o->selection_color(1);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)name_public_cb);
-      o->when(FL_WHEN_CHANGED);
-    }
-    { Fl_Input* o = new Fl_Input(90, 35, 170, 20, "Class:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)subclass_cb, (void*)(4));
+    { Fl_Tabs* o = new Fl_Tabs(10, 10, 395, 315);
+      o->callback((Fl_Callback*)cb_);
       o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Choice* o = new Fl_Choice(260, 35, 100, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)subtype_cb);
-    }
-    { Fl_Input* o = new Fl_Input(90, 60, 270, 20, "Label:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)label_cb);
-      o->when(FL_WHEN_CHANGED);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 80, 150, 20, "Label Type:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)labeltype_cb);
-      o->menu(labeltypemenu);
-    }
-    { Fl_Button* o = new Fl_Button(240, 80, 20, 20, "@-1<-");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
-    }
-    { Fl_Button* o = new Fl_Button(260, 80, 20, 20, "@-1->");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
-    }
-    { Fl_Button* o = new Fl_Button(280, 80, 20, 20, "@-18");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
-    }
-    { Fl_Button* o = new Fl_Button(300, 80, 20, 20, "@-12");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
-    }
-    { Fl_Button* o = new Fl_Button(320, 80, 20, 20, "@-3square");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labeltype(FL_SYMBOL_LABEL);
-      o->labelcolor(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
-    }
-    { Fl_Button* o = new Fl_Button(340, 80, 20, 10, "wrap");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
-    }
-    { Fl_Button* o = new Fl_Button(340, 90, 20, 10, "clip");
-      o->type(1);
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 100, 170, 20, "Label Font:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)labelfont_cb);
-      o->menu(fontmenu);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(260, 100, 50, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->maximum(100);
-      o->step(1);
-      o->value(14);
-      o->callback((Fl_Callback*)labelsize_cb);
-    }
-    { Fl_Button* o = new Fl_Button(310, 100, 50, 20, "Label Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)labelcolor_cb);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 125, 220, 20, "Box:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)box_cb);
-      o->menu(boxmenu);
-    }
-    { Fl_Button* o = new Fl_Button(310, 125, 50, 20, "Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)color_cb);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 145, 220, 20, "Down Box:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)down_box_cb);
-      o->menu(boxmenu);
-    }
-    { Fl_Button* o = new Fl_Button(310, 145, 50, 20, "Select Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)color2_cb);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 170, 170, 20, "Text Font:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)textfont_cb);
-      o->hide();
-      o->menu(fontmenu);
-    }
-    { Fl_Input* o = new Fl_Input(90, 170, 170, 20, "xclass:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)xclass_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Shortcut_Button* o = new Shortcut_Button(90, 170, 270, 20, "Shortcut:");
-      o->box(FL_THIN_UP_BOX);
-      o->color(7);
-      o->selection_color(7);
-      o->callback((Fl_Callback*)shortcut_in_cb);
-      o->align(FL_ALIGN_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(260, 170, 50, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->maximum(100);
-      o->step(1);
-      o->value(14);
-      o->callback((Fl_Callback*)textsize_cb);
-      o->hide();
-    }
-    { Fl_Button* o = new Fl_Button(310, 170, 50, 20, "Text Color");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(8);
-      o->callback((Fl_Callback*)textcolor_cb);
-      o->hide();
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(40, 205, 60, 20, "Size:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->step(0.010101);
-      o->callback((Fl_Callback*)slider_size_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(105, 205, 60, 20, "Minimum:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)min_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(170, 205, 60, 20, "Maximum:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->value(1);
-      o->callback((Fl_Callback*)max_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(235, 205, 60, 20, "Step:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)step_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Value_Input* o = new Fl_Value_Input(300, 205, 60, 20, "Value:");
-      o->box(FL_THIN_UP_BOX);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)value_cb);
-      o->align(FL_ALIGN_TOP_LEFT);
-    }
-    { Fl_Group* o = new Fl_Group(20, 230, 340, 20);
-      o->callback((Fl_Callback*)propagate_load);
-      o->align(FL_ALIGN_TOP_LEFT);
-      { Fl_Light_Button* o = new Fl_Light_Button(30, 230, 70, 20, "non_modal");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(9);
-        o->callback((Fl_Callback*)non_modal_cb);
-        o->align(132|FL_ALIGN_INSIDE);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(105, 230, 60, 20, "visible");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)visible_cb);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(105, 230, 60, 20, "modal");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)modal_cb);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(170, 230, 60, 20, "active");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)active_cb);
+      { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "GUI");
+        o->callback((Fl_Callback*)propagate_load);
+        o->when(FL_WHEN_NEVER);
+        { Fl_Input* o = new Fl_Input(95, 40, 195, 20, "Label:");
+          o->callback((Fl_Callback*)label_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Choice* o = new Fl_Choice(290, 40, 105, 20);
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)labeltype_cb);
+          o->menu(labeltypemenu);
+        }
+        { Fl_Input* o = new Fl_Input(95, 65, 195, 20, "Image:");
+          o->callback((Fl_Callback*)image_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Button* o = new Fl_Button(290, 65, 105, 20, "Browse...");
+          o->callback((Fl_Callback*)image_browse_cb);
+        }
+        { Fl_Input* o = new Fl_Input(95, 90, 195, 20, "Inactive:");
+          o->callback((Fl_Callback*)inactive_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Button* o = new Fl_Button(290, 90, 105, 20, "Browse...");
+          o->callback((Fl_Callback*)inactive_browse_cb);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(95, 150, 60, 20, "X:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)x_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(155, 150, 60, 20, "Y:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)y_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(215, 150, 60, 20, "Width:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)w_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(275, 150, 60, 20, "Height:");
+          o->labelsize(10);
+          o->maximum(2048);
+          o->step(1);
+          o->callback((Fl_Callback*)h_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Group* o = new Fl_Group(95, 115, 300, 20, "Alignment:");
+          o->callback((Fl_Callback*)propagate_load);
+          o->align(FL_ALIGN_LEFT);
+          { Fl_Button* o = new Fl_Button(95, 115, 40, 20, "clip");
+            o->type(1);
+            o->labelsize(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP));
+          }
+          { Fl_Button* o = new Fl_Button(135, 115, 40, 20, "wrap");
+            o->type(1);
+            o->labelsize(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
+          }
+          { Fl_Button* o = new Fl_Button(175, 115, 55, 20, "text\nimage");
+            o->type(1);
+            o->labelsize(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP));
+          }
+          { Fl_Button* o = new Fl_Button(295, 115, 20, 20, "@-1<-");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT));
+          }
+          { Fl_Button* o = new Fl_Button(315, 115, 20, 20, "@-1->");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT));
+          }
+          { Fl_Button* o = new Fl_Button(335, 115, 20, 20, "@-18");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP));
+          }
+          { Fl_Button* o = new Fl_Button(355, 115, 20, 20, "@-12");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM));
+          }
+          { Fl_Button* o = new Fl_Button(375, 115, 20, 20, "@-3square");
+            o->type(1);
+            o->labelcolor(8);
+            o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE));
+          }
+          o->end();
+        }
+        { Fl_Box* o = new Fl_Box(20, 150, 75, 20, "Position:");
+          o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+        }
+        { Fl_Box* o = new Fl_Box(20, 185, 75, 20, "Values:");
+          o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(95, 185, 60, 20, "Size:");
+          o->labelsize(10);
+          o->step(0.010101);
+          o->callback((Fl_Callback*)slider_size_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(155, 185, 60, 20, "Minimum:");
+          o->labelsize(10);
+          o->callback((Fl_Callback*)min_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(215, 185, 60, 20, "Maximum:");
+          o->labelsize(10);
+          o->value(1);
+          o->callback((Fl_Callback*)max_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(275, 185, 60, 20, "Step:");
+          o->labelsize(10);
+          o->callback((Fl_Callback*)step_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(335, 185, 60, 20, "Value:");
+          o->labelsize(10);
+          o->callback((Fl_Callback*)value_cb);
+          o->align(FL_ALIGN_TOP_LEFT);
+        }
+        { Shortcut_Button* o = new Shortcut_Button(95, 210, 300, 20, "Shortcut:");
+          o->box(FL_DOWN_BOX);
+          o->color(7);
+          o->selection_color(7);
+          o->callback((Fl_Callback*)shortcut_in_cb);
+          o->align(FL_ALIGN_LEFT);
+        }
+        { Fl_Group* o = new Fl_Group(20, 235, 375, 45);
+          o->callback((Fl_Callback*)propagate_load);
+          o->align(FL_ALIGN_LEFT);
+          { Fl_Light_Button* o = new Fl_Light_Button(210, 235, 60, 20, "Border");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)border_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(270, 235, 55, 20, "Modal");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)modal_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(325, 235, 70, 20, "Nonmodal");
+            o->selection_color(1);
+            o->labelsize(9);
+            o->callback((Fl_Callback*)non_modal_cb);
+            o->align(132|FL_ALIGN_INSIDE);
+          }
+          { Fl_Box* o = new Fl_Box(20, 260, 75, 20, "Attributes:");
+            o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(95, 260, 70, 20, "Visible");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)visible_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(165, 260, 70, 20, "Active");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)active_cb);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(235, 260, 70, 20, "Resizable");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)resizable_cb);
+            o->when(FL_WHEN_CHANGED);
+          }
+          { Fl_Light_Button* o = new Fl_Light_Button(305, 260, 70, 20, "Hotspot");
+            o->selection_color(1);
+            o->labelsize(10);
+            o->callback((Fl_Callback*)hotspot_cb);
+            o->when(FL_WHEN_CHANGED);
+          }
+          o->end();
+        }
+        { Fl_Input* o = new Fl_Input(95, 235, 115, 20, "X Class:");
+          o->callback((Fl_Callback*)xclass_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        new Fl_Input(95, 285, 300, 20, "Tooltip:");
+        o->end();
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(170, 230, 60, 20, "border");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)border_cb);
+      { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "Style");
+        o->callback((Fl_Callback*)propagate_load);
+        o->when(FL_WHEN_NEVER);
+        o->hide();
+        { Fl_Choice* o = new Fl_Choice(100, 40, 155, 20, "Label Font:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)labelfont_cb);
+          o->menu(fontmenu);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(255, 40, 50, 20);
+          o->maximum(100);
+          o->step(1);
+          o->value(14);
+          o->callback((Fl_Callback*)labelsize_cb);
+        }
+        { Fl_Button* o = new Fl_Button(305, 40, 90, 20, "Label Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)labelcolor_cb);
+        }
+        { Fl_Choice* o = new Fl_Choice(100, 65, 205, 20, "Box:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)box_cb);
+          o->menu(boxmenu);
+        }
+        { Fl_Button* o = new Fl_Button(305, 65, 90, 20, "Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)color_cb);
+        }
+        { Fl_Choice* o = new Fl_Choice(100, 90, 205, 20, "Down Box:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)down_box_cb);
+          o->menu(boxmenu);
+        }
+        { Fl_Button* o = new Fl_Button(305, 90, 90, 20, "Select Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)color2_cb);
+        }
+        { Fl_Choice* o = new Fl_Choice(100, 115, 155, 20, "Text Font:");
+          o->box(FL_DOWN_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)textfont_cb);
+          o->menu(fontmenu);
+        }
+        { Fl_Value_Input* o = new Fl_Value_Input(255, 115, 50, 20);
+          o->maximum(100);
+          o->step(1);
+          o->value(14);
+          o->callback((Fl_Callback*)textsize_cb);
+        }
+        { Fl_Button* o = new Fl_Button(305, 115, 90, 20, "Text Color");
+          o->labelsize(8);
+          o->callback((Fl_Callback*)textcolor_cb);
+        }
+        o->end();
       }
-      { Fl_Light_Button* o = new Fl_Light_Button(235, 230, 60, 20, "resizable");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)resizable_cb);
-        o->when(FL_WHEN_CHANGED);
-      }
-      { Fl_Light_Button* o = new Fl_Light_Button(300, 230, 60, 20, "hotspot");
-        o->box(FL_THIN_UP_BOX);
-        o->selection_color(1);
-        o->labelsize(10);
-        o->callback((Fl_Callback*)hotspot_cb);
-        o->when(FL_WHEN_CHANGED);
+      { Fl_Group* o = new Fl_Group(10, 30, 395, 295, "C++");
+        o->callback((Fl_Callback*)propagate_load);
+        o->when(FL_WHEN_NEVER);
+        o->hide();
+        { Fl_Input* o = new Fl_Input(100, 65, 230, 20, "Name:");
+          o->callback((Fl_Callback*)name_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Light_Button* o = new Fl_Light_Button(330, 65, 65, 20, "public");
+          o->selection_color(1);
+          o->labelsize(10);
+          o->callback((Fl_Callback*)name_public_cb);
+          o->when(FL_WHEN_CHANGED);
+        }
+        { Fl_Input* o = new Fl_Input(100, 40, 160, 20, "Class:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)subclass_cb, (void*)(4));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Choice* o = new Fl_Choice(260, 40, 135, 20);
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)subtype_cb);
+        }
+        { Fl_Input* o = v_input[0] = new Fl_Input(100, 90, 295, 20, "Extra Code:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(0));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = v_input[1] = new Fl_Input(100, 110, 295, 20);
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(1));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = v_input[2] = new Fl_Input(100, 130, 295, 20);
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(2));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = v_input[3] = new Fl_Input(100, 150, 295, 20);
+          o->textfont(4);
+          o->callback((Fl_Callback*)v_input_cb, (void*)(3));
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Box* o = new Fl_Box(20, 175, 75, 20, "Callback:");
+          o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+        }
+        { Fl_Input* o = new Fl_Input(100, 175, 295, 90);
+          o->type(4);
+          o->textfont(4);
+          o->callback((Fl_Callback*)callback_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Box* o = new Fl_Box(95, 325, 100, 0, "label");
+          o->hide();
+          o->deactivate();
+        }
+        { Fl_Input* o = new Fl_Input(100, 270, 140, 20, "User Data:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)user_data_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Input* o = new Fl_Input(100, 295, 140, 20, "Type:");
+          o->textfont(4);
+          o->callback((Fl_Callback*)user_data_type_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        { Fl_Choice* o = new Fl_Choice(290, 270, 105, 20, "When:");
+          o->box(FL_THIN_UP_BOX);
+          o->down_box(FL_BORDER_BOX);
+          o->callback((Fl_Callback*)when_cb);
+          o->when(FL_WHEN_NEVER);
+          o->menu(whenmenu);
+        }
+        { Fl_Light_Button* o = new Fl_Light_Button(290, 295, 105, 20, "No Change");
+          o->selection_color(1);
+          o->labelsize(10);
+          o->callback((Fl_Callback*)when_button_cb);
+          o->when(FL_WHEN_NEVER);
+        }
+        o->end();
       }
       o->end();
     }
-    { Fl_Input* o = v_input[0] = new Fl_Input(90, 260, 270, 20, "Extra Code:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(0));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = v_input[1] = new Fl_Input(90, 280, 270, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(1));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = v_input[2] = new Fl_Input(90, 300, 270, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(2));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = v_input[3] = new Fl_Input(90, 320, 270, 20);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)v_input_cb, (void*)(3));
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Box* o = new Fl_Box(0, 350, 90, 20, "Callback:");
-      o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
-    }
-    { Fl_Input* o = new Fl_Input(90, 350, 270, 50);
-      o->type(4);
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)callback_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Box* o = new Fl_Box(90, 370, 100, 30, "label");
-      o->hide();
-      o->deactivate();
-      Fl_Group::current()->resizable(o);
-    }
-    { Fl_Input* o = new Fl_Input(90, 400, 170, 20, "user_data:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)user_data_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Input* o = new Fl_Input(300, 400, 60, 20, "Type:");
-      o->box(FL_THIN_UP_BOX);
-      o->textfont(4);
-      o->callback((Fl_Callback*)user_data_type_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Choice* o = new Fl_Choice(90, 420, 100, 20, "When:");
-      o->box(FL_THIN_UP_BOX);
-      o->callback((Fl_Callback*)when_cb);
-      o->when(FL_WHEN_NEVER);
-      o->menu(whenmenu);
-    }
-    { Fl_Light_Button* o = new Fl_Light_Button(190, 420, 70, 20, "no change");
-      o->box(FL_THIN_UP_BOX);
-      o->selection_color(1);
-      o->labelsize(10);
-      o->callback((Fl_Callback*)when_button_cb);
-      o->when(FL_WHEN_NEVER);
-    }
-    { Fl_Group* o = new Fl_Group(10, 450, 350, 25);
-      { Fl_Button* o = new Fl_Button(25, 450, 80, 25, "no &overlay");
+    { Fl_Group* o = new Fl_Group(10, 335, 395, 25);
+      { Fl_Button* o = new Fl_Button(50, 335, 100, 25, "No &Overlay");
         o->labelcolor(1);
         o->callback((Fl_Callback*)overlay_cb);
       }
-      { Fl_Button* o = new Fl_Button(110, 450, 80, 25, "Revert");
+      { Fl_Button* o = new Fl_Button(155, 335, 80, 25, "Revert");
         o->callback((Fl_Callback*)revert_cb);
       }
-      { Fl_Button* o = new Fl_Button(280, 450, 80, 25, "Cancel");
+      { Fl_Button* o = new Fl_Button(325, 335, 80, 25, "Cancel");
         o->callback((Fl_Callback*)cancel_cb);
       }
-      { Fl_Return_Button* o = new Fl_Return_Button(195, 450, 80, 25, "OK");
+      { Fl_Return_Button* o = new Fl_Return_Button(240, 335, 80, 25, "OK");
         o->callback((Fl_Callback*)ok_cb);
       }
       o->end();
     }
     o->end();
+    o->resizable(o);
   }
   return w;
 }