Rebuilt using 1.0 beta 19981021 tree.

git-svn-id: file:///fltk/svn/fltk/trunk@50 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

8 files changed, 112 insertions, 143 deletions

diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx
index a880d39dd..608bf431a 100644
--- a/fluid/about_panel.cxx
+++ b/fluid/about_panel.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include "about_panel.H"
 
diff --git a/fluid/about_panel.h b/fluid/about_panel.h
index 7113cf5cf..ece923b69 100644
--- a/fluid/about_panel.h
+++ b/fluid/about_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index b5ab1f91d..218c8b80d 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include "alignment_panel.H"
 
diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h
index ae545f5d1..5e4fd16bb 100644
--- a/fluid/alignment_panel.h
+++ b/fluid/alignment_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx
index 0b6bccd61..7dd4250fa 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include "function_panel.H"
 
@@ -14,125 +14,80 @@ Fl_Return_Button *f_panel_ok;
 
 Fl_Button *f_panel_cancel;
 
-Fl_Window *code_panel;
-
-Fl_Input *code_input;
-
-Fl_Return_Button *code_panel_ok;
-
-Fl_Button *code_panel_cancel;
-
-Fl_Window *codeblock_panel;
-
-Fl_Input *code_before_input;
-
-Fl_Input *code_after_input;
-
-Fl_Return_Button *codeblock_panel_ok;
-
-Fl_Button *codeblock_panel_cancel;
-
-Fl_Window *declblock_panel;
-
-Fl_Input *decl_before_input;
-
-Fl_Input *decl_after_input;
-
-Fl_Return_Button *declblock_panel_ok;
-
-Fl_Button *declblock_panel_cancel;
-
-Fl_Window *decl_panel;
-
-Fl_Light_Button *decl_public_button;
-
-Fl_Input *decl_input;
-
-Fl_Return_Button *decl_panel_ok;
-
-Fl_Button *decl_panel_cancel;
-
-Fl_Window *class_panel;
-
-Fl_Light_Button *c_public_button;
-
-Fl_Input *c_name_input;
-
-Fl_Input *c_subclass_input;
-
-Fl_Return_Button *c_panel_ok;
-
-Fl_Button *c_panel_cancel;
-
 Fl_Window* make_function_panel() {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(287, 173, "function/method");
-    w = function_panel = o;
-    w->set_modal();
-    { Fl_Light_Button* o = new Fl_Light_Button(10, 15, 65, 25, "public");
-      f_public_button = o;
+  Fl_Window* w;
+  { Fl_Window* o = function_panel = w = new Fl_Window(287, 173, "function/method");
+    { Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
       o->labelsize(10);
       o->when(0);
     }
-    { Fl_Input* o = new Fl_Input(10, 60, 270, 25, "name(args): (blank for main())");
-      f_name_input = o;
+    { Fl_Input* o = f_name_input = new Fl_Input(10, 60, 270, 25, "name(args): (blank for main())");
       o->labelsize(12);
       o->align(5);
       o->when(0);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Input* o = new Fl_Input(10, 105, 270, 25, "return type: (blank to return outermost widget)");
-      f_return_type_input = o;
+    { Fl_Input* o = f_return_type_input = new Fl_Input(10, 105, 270, 25, "return type: (blank to return outermost widget)");
       o->labelsize(12);
       o->align(5);
       o->when(0);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(110, 140, 80, 25, "OK");
-      f_panel_ok = o;
+    { Fl_Return_Button* o = f_panel_ok = new Fl_Return_Button(110, 140, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = new Fl_Button(200, 140, 80, 25, "cancel");
-      f_panel_cancel = o;
+    { Fl_Button* o = f_panel_cancel = new Fl_Button(200, 140, 80, 25, "cancel");
       o->shortcut(0xff1b);
     }
-    w->end();
+    o->set_modal();
+    o->end();
   }
   return w;
 }
 
+Fl_Window *code_panel;
+
+Fl_Input *code_input;
+
+Fl_Return_Button *code_panel_ok;
+
+Fl_Button *code_panel_cancel;
+
 Fl_Window* make_code_panel() {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(291, 178, "code");
-    w = code_panel = o;
-    w->set_modal();
-    { Fl_Input* o = new Fl_Input(6, 5, 280, 135);
-      code_input = o;
+  Fl_Window* w;
+  { Fl_Window* o = code_panel = w = new Fl_Window(291, 178, "code");
+    { Fl_Input* o = code_input = new Fl_Input(6, 5, 280, 135);
       o->type(4);
       o->labelsize(12);
       o->align(0);
       o->when(0);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(115, 145, 80, 25, "OK");
-      code_panel_ok = o;
+    { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(115, 145, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = new Fl_Button(205, 145, 80, 25, "cancel");
-      code_panel_cancel = o;
+    { Fl_Button* o = code_panel_cancel = new Fl_Button(205, 145, 80, 25, "cancel");
       o->shortcut(0xff1b);
     }
-    w->end();
+    o->set_modal();
+    o->end();
   }
   return w;
 }
 
+Fl_Window *codeblock_panel;
+
+Fl_Input *code_before_input;
+
+Fl_Input *code_after_input;
+
+Fl_Return_Button *codeblock_panel_ok;
+
+Fl_Button *codeblock_panel_cancel;
+
 Fl_Window* make_codeblock_panel() {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(293, 134, "codeblock");
-    w = codeblock_panel = o;
-    w->set_modal();
-    { Fl_Input* o = new Fl_Input(10, 5, 275, 25);
-      code_before_input = o;
+  Fl_Window* w;
+  { Fl_Window* o = codeblock_panel = w = new Fl_Window(293, 134, "codeblock");
+    { Fl_Input* o = code_before_input = new Fl_Input(10, 5, 275, 25);
       o->labelsize(12);
       o->align(5);
       o->when(0);
@@ -141,32 +96,37 @@ Fl_Window* make_codeblock_panel() {
     { Fl_Box* o = new Fl_Box(10, 35, 270, 25, "\"{...child code...}\" is inserted here");
       o->align(20);
     }
-    { Fl_Input* o = new Fl_Input(10, 65, 275, 25);
-      code_after_input = o;
+    { Fl_Input* o = code_after_input = new Fl_Input(10, 65, 275, 25);
       o->labelsize(12);
       o->align(5);
       o->when(0);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(115, 100, 80, 25, "OK");
-      codeblock_panel_ok = o;
+    { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(115, 100, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = new Fl_Button(205, 100, 80, 25, "cancel");
-      codeblock_panel_cancel = o;
+    { Fl_Button* o = codeblock_panel_cancel = new Fl_Button(205, 100, 80, 25, "cancel");
       o->shortcut(0xff1b);
     }
-    w->end();
+    o->set_modal();
+    o->end();
   }
   return w;
 }
 
+Fl_Window *declblock_panel;
+
+Fl_Input *decl_before_input;
+
+Fl_Input *decl_after_input;
+
+Fl_Return_Button *declblock_panel_ok;
+
+Fl_Button *declblock_panel_cancel;
+
 Fl_Window* make_declblock_panel() {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(293, 134, "declaration block");
-    w = declblock_panel = o;
-    w->set_modal();
-    { Fl_Input* o = new Fl_Input(15, 10, 275, 25);
-      decl_before_input = o;
+  Fl_Window* w;
+  { Fl_Window* o = declblock_panel = w = new Fl_Window(293, 134, "declaration block");
+    { Fl_Input* o = decl_before_input = new Fl_Input(15, 10, 275, 25);
       o->labelsize(12);
       o->align(5);
       o->when(0);
@@ -175,88 +135,97 @@ Fl_Window* make_declblock_panel() {
     { Fl_Box* o = new Fl_Box(15, 40, 270, 25, "\"\\n...child code...\\n\" is inserted here");
       o->align(20);
     }
-    { Fl_Input* o = new Fl_Input(15, 70, 275, 25);
-      decl_after_input = o;
+    { Fl_Input* o = decl_after_input = new Fl_Input(15, 70, 275, 25);
       o->labelsize(12);
       o->align(5);
       o->when(0);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(120, 105, 80, 25, "OK");
-      declblock_panel_ok = o;
+    { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(120, 105, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = new Fl_Button(210, 105, 80, 25, "cancel");
-      declblock_panel_cancel = o;
+    { Fl_Button* o = declblock_panel_cancel = new Fl_Button(210, 105, 80, 25, "cancel");
       o->shortcut(0xff1b);
     }
-    w->end();
+    o->set_modal();
+    o->end();
   }
   return w;
 }
 
+Fl_Window *decl_panel;
+
+Fl_Light_Button *decl_public_button;
+
+Fl_Input *decl_input;
+
+Fl_Return_Button *decl_panel_ok;
+
+Fl_Button *decl_panel_cancel;
+
 Fl_Window* make_decl_panel() {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(290, 176, "declaration");
-    w = decl_panel = o;
-    { Fl_Light_Button* o = new Fl_Light_Button(10, 15, 65, 25, "public");
-      decl_public_button = o;
+  Fl_Window* w;
+  { Fl_Window* o = decl_panel = w = new Fl_Window(290, 176, "declaration");
+    { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 15, 65, 25, "public");
       o->labelsize(10);
       o->when(0);
     }
-    { Fl_Input* o = new Fl_Input(10, 50, 270, 25, "can be any declartion, like \"int x;\",\nan external symbol like \"extern \
+    { Fl_Input* o = decl_input = new Fl_Input(10, 50, 270, 25, "can be any declartion, like \"int x;\",\nan external symbol like \"extern \
 int foo();\",\na #directive like \"#include <foo.h>\",\nor a comment like \"\
 //foo\" or \"/*foo*/\"");
-      decl_input = o;
       o->labelsize(12);
       o->align(6);
       o->when(0);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(115, 145, 80, 25, "OK");
-      decl_panel_ok = o;
+    { Fl_Return_Button* o = decl_panel_ok = new Fl_Return_Button(115, 145, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = new Fl_Button(205, 145, 80, 25, "cancel");
-      decl_panel_cancel = o;
+    { Fl_Button* o = decl_panel_cancel = new Fl_Button(205, 145, 80, 25, "cancel");
       o->shortcut(0xff1b);
     }
-    w->end();
+    o->end();
   }
   return w;
 }
 
+Fl_Window *class_panel;
+
+Fl_Light_Button *c_public_button;
+
+Fl_Input *c_name_input;
+
+Fl_Input *c_subclass_input;
+
+Fl_Return_Button *c_panel_ok;
+
+Fl_Button *c_panel_cancel;
+
 Fl_Window* make_class_panel() {
-  Fl_Window *w;
-  { Fl_Window* o = new Fl_Window(287, 173, "class");
-    w = class_panel = o;
-    w->set_modal();
-    { Fl_Light_Button* o = new Fl_Light_Button(10, 10, 65, 25, "public");
-      c_public_button = o;
+  Fl_Window* w;
+  { Fl_Window* o = class_panel = w = new Fl_Window(287, 173, "class");
+    { Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 65, 25, "public");
       o->labelsize(10);
       o->when(0);
     }
-    { Fl_Input* o = new Fl_Input(10, 55, 270, 25, "name:");
-      c_name_input = o;
+    { Fl_Input* o = c_name_input = new Fl_Input(10, 55, 270, 25, "name:");
       o->labelsize(12);
       o->align(5);
       o->when(0);
       Fl_Group::current()->resizable(o);
     }
-    { Fl_Input* o = new Fl_Input(10, 100, 270, 25, "subclass of (text between : and {)");
-      c_subclass_input = o;
+    { Fl_Input* o = c_subclass_input = new Fl_Input(10, 100, 270, 25, "subclass of (text between : and {)");
       o->labelsize(12);
       o->align(5);
       o->when(0);
     }
-    { Fl_Return_Button* o = new Fl_Return_Button(110, 135, 80, 25, "OK");
-      c_panel_ok = o;
+    { Fl_Return_Button* o = c_panel_ok = new Fl_Return_Button(110, 135, 80, 25, "OK");
       w->hotspot(o);
     }
-    { Fl_Button* o = new Fl_Button(200, 135, 80, 25, "cancel");
-      c_panel_cancel = o;
+    { Fl_Button* o = c_panel_cancel = new Fl_Button(200, 135, 80, 25, "cancel");
       o->shortcut(0xff1b);
     }
-    w->end();
+    o->set_modal();
+    o->end();
   }
   return w;
 }
diff --git a/fluid/function_panel.h b/fluid/function_panel.h
index f0a9d2506..016d846d3 100644
--- a/fluid/function_panel.h
+++ b/fluid/function_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
@@ -13,34 +13,34 @@ extern Fl_Input *f_name_input;
 extern Fl_Input *f_return_type_input;
 extern Fl_Return_Button *f_panel_ok;
 extern Fl_Button *f_panel_cancel;
+Fl_Window* make_function_panel();
 extern Fl_Window *code_panel;
 extern Fl_Input *code_input;
 extern Fl_Return_Button *code_panel_ok;
 extern Fl_Button *code_panel_cancel;
+Fl_Window* make_code_panel();
 extern Fl_Window *codeblock_panel;
 extern Fl_Input *code_before_input;
 extern Fl_Input *code_after_input;
 extern Fl_Return_Button *codeblock_panel_ok;
 extern Fl_Button *codeblock_panel_cancel;
+Fl_Window* make_codeblock_panel();
 extern Fl_Window *declblock_panel;
 extern Fl_Input *decl_before_input;
 extern Fl_Input *decl_after_input;
 extern Fl_Return_Button *declblock_panel_ok;
 extern Fl_Button *declblock_panel_cancel;
+Fl_Window* make_declblock_panel();
 extern Fl_Window *decl_panel;
 extern Fl_Light_Button *decl_public_button;
 extern Fl_Input *decl_input;
 extern Fl_Return_Button *decl_panel_ok;
 extern Fl_Button *decl_panel_cancel;
+Fl_Window* make_decl_panel();
 extern Fl_Window *class_panel;
 extern Fl_Light_Button *c_public_button;
 extern Fl_Input *c_name_input;
 extern Fl_Input *c_subclass_input;
 extern Fl_Return_Button *c_panel_ok;
 extern Fl_Button *c_panel_cancel;
-Fl_Window* make_function_panel();
-Fl_Window* make_code_panel();
-Fl_Window* make_codeblock_panel();
-Fl_Window* make_declblock_panel();
-Fl_Window* make_decl_panel();
 Fl_Window* make_class_panel();
diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 23ee01e19..8d6594488 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -1,11 +1,11 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include "widget_panel.H"
 
 Fl_Input *v_input[4];
 
 Fl_Window* make_widget_panel() {
-  Fl_Window *w;
+  Fl_Window* w;
   { Fl_Window* o = w = new Fl_Window(370, 480);
     w->hotspot(o);
     { Fl_Input* o = new Fl_Input(90, 10, 210, 20, "name:");
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h
index 9e304d16a..8e1997194 100644
--- a/fluid/widget_panel.h
+++ b/fluid/widget_panel.h
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 0.99
+// generated by Fast Light User Interface Designer (fluid) version 1.00
 
 #include "Shortcut_Button.H"
 #include <FL/Fl.H>