More Doxygen comment support for Fluid.

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

fluid/Fl_Type.cxx

@@ -165,6 +165,8 @@ Fl_Pixmap *pixmap[] = { 0, &window_pixmap, &button_pixmap, &checkbutton_pixmap,
  &dial_pixmap, &roller_pixmap, &valueinput_pixmap, &valueoutput_pixmap, &comment_pixmap,             /* 42..46 */
  &spinner_pixmap, &widgetclass_pixmap /* 47..48 */ };
 
+extern int show_comments;
+
 ////////////////////////////////////////////////////////////////
 
 class Widget_Browser : public Fl_Browser_ {
@@ -234,7 +236,7 @@ void Widget_Browser::item_select(void *l,int v) {((Fl_Type*)l)->new_selected = v
 int Widget_Browser::item_height(void *l) const {
   Fl_Type *t = (Fl_Type*)l;
   if (t->visible) {
-    if (t->comment())
+    if (show_comments && t->comment())
       return textsize()*2+1;
     else
       return textsize()+2;
@@ -260,7 +262,7 @@ void Widget_Browser::item_draw(void *v, int X, int Y, int, int) const {
   Fl_Type *l = (Fl_Type *)v;
   X += 3 + 18 + l->level * 12;
   int comment_incr = 0;
-  if (l->comment()) {
+  if (show_comments && l->comment()) {
     char buf[82], *d = buf;
     const char *s = l->comment();
     for (int i=0; i<80; i++) {

fluid/about_panel.fl

@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0108 
+version 1.0300 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -34,7 +34,7 @@ comment {//
 decl {void show_help(const char *name);} {public
 } 
 
-Function {make_about_panel()} {open
+Function {make_about_panel()} {selected
 } {
   Fl_Window about_panel {
     label {About FLUID} open
@@ -51,7 +51,7 @@ Version 1.3.0}
     }
     Fl_Box {} {
       label {Copyright 1998-2008 by
-Bill Spitzak and others} selected
+Bill Spitzak and others}
       xywh {135 89 170 42} align 148
     }
     Fl_Button {} {

fluid/alignment_panel.cxx

@@ -3,7 +3,7 @@
 //
 // Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2008 by Bill Spitzak and others.
+// Copyright 1998-2005 by Bill Spitzak and others.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -74,7 +74,7 @@ Fl_Double_Window* make_project_window() {
         o->labelsize(11);
         { Fl_Box* o = new Fl_Box(15, 40, 325, 15, "Use \"name.ext\" to set name or just \".ext\" to set extension.");
           o->labelsize(11);
-          o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE);
+          o->align(Fl_Align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE));
         } // Fl_Box* o
         { header_file_input = new Fl_Input(96, 60, 228, 20, "Header File:");
           header_file_input->tooltip("The name of the generated header file.");
@@ -209,8 +209,12 @@ static void cb_prevpos_button(Fl_Check_Button*, void*) {
   fluid_prefs.set("prev_window_pos", prevpos_button->value());
 }
 
-static void cb_Close1(Fl_Button*, void*) {
-  settings_window->hide();
+Fl_Check_Button *show_comments_button=(Fl_Check_Button *)0;
+
+static void cb_show_comments_button(Fl_Check_Button*, void*) {
+  show_comments = show_comments_button->value();
+fluid_prefs.set("show_comments", show_comments);
+redraw_browser();
 }
 
 Fl_Spinner *recent_spinner=(Fl_Spinner *)0;
@@ -220,8 +224,12 @@ static void cb_recent_spinner(Fl_Spinner*, void*) {
 load_history();
 }
 
+static void cb_Close1(Fl_Button*, void*) {
+  settings_window->hide();
+}
+
 Fl_Double_Window* make_settings_window() {
-  { settings_window = new Fl_Double_Window(340, 225, "GUI Settings");
+  { settings_window = new Fl_Double_Window(342, 242, "GUI Settings");
     { scheme_choice = new Fl_Choice(116, 10, 115, 25, "Scheme:");
       scheme_choice->down_box(FL_BORDER_BOX);
       scheme_choice->labelfont(1);
@@ -232,10 +240,10 @@ Fl_Double_Window* make_settings_window() {
       scheme_choice->value(s);
       scheme_cb(0, 0);
     } // Fl_Choice* scheme_choice
-    { Fl_Group* o = new Fl_Group(116, 45, 215, 100, "Options:\n\n\n\n\n");
+    { Fl_Group* o = new Fl_Group(70, 40, 266, 128, "Options:\n\n\n\n\n");
       o->labelfont(1);
-      o->align(FL_ALIGN_LEFT);
-      { tooltips_button = new Fl_Check_Button(116, 45, 113, 25, "Show Tooltips");
+      o->align(Fl_Align(FL_ALIGN_LEFT));
+      { tooltips_button = new Fl_Check_Button(116, 40, 113, 25, "Show Tooltips");
         tooltips_button->down_box(FL_DOWN_BOX);
         tooltips_button->callback((Fl_Callback*)cb_tooltips_button);
         int b;
@@ -243,34 +251,36 @@ Fl_Double_Window* make_settings_window() {
         tooltips_button->value(b);
         Fl_Tooltip::enable(b);
       } // Fl_Check_Button* tooltips_button
-      { completion_button = new Fl_Check_Button(116, 70, 186, 25, "Show Completion Dialogs");
+      { completion_button = new Fl_Check_Button(116, 65, 186, 25, "Show Completion Dialogs");
         completion_button->down_box(FL_DOWN_BOX);
         completion_button->callback((Fl_Callback*)cb_completion_button);
         int b;
         fluid_prefs.get("show_completion_dialogs", b, 1);
         completion_button->value(b);
       } // Fl_Check_Button* completion_button
-      { openlast_button = new Fl_Check_Button(116, 95, 215, 25, "Open Previous File on Startup");
+      { openlast_button = new Fl_Check_Button(115, 90, 215, 25, "Open Previous File on Startup");
         openlast_button->down_box(FL_DOWN_BOX);
         openlast_button->callback((Fl_Callback*)cb_openlast_button);
         int b;
         fluid_prefs.get("open_previous_file", b, 0);
         openlast_button->value(b);
       } // Fl_Check_Button* openlast_button
-      { prevpos_button = new Fl_Check_Button(116, 120, 210, 25, "Remember Window Positions");
+      { prevpos_button = new Fl_Check_Button(115, 115, 210, 25, "Remember Window Positions");
         prevpos_button->down_box(FL_DOWN_BOX);
         prevpos_button->callback((Fl_Callback*)cb_prevpos_button);
         int b;
         fluid_prefs.get("prev_window_pos", b, 1);
         prevpos_button->value(b);
       } // Fl_Check_Button* prevpos_button
+      { show_comments_button = new Fl_Check_Button(115, 140, 210, 25, "Show Comments in Browser");
+        show_comments_button->down_box(FL_DOWN_BOX);
+        show_comments_button->callback((Fl_Callback*)cb_show_comments_button);
+        fluid_prefs.get("show_comments", show_comments, 1);
+        show_comments_button->value(show_comments);
+      } // Fl_Check_Button* show_comments_button
       o->end();
     } // Fl_Group* o
-    { Fl_Button* o = new Fl_Button(266, 190, 64, 25, "Close");
-      o->tooltip("Close this dialog.");
-      o->callback((Fl_Callback*)cb_Close1);
-    } // Fl_Button* o
-    { recent_spinner = new Fl_Spinner(116, 155, 40, 25, "# Recent Files:");
+    { recent_spinner = new Fl_Spinner(115, 170, 40, 25, "# Recent Files:");
       recent_spinner->labelfont(1);
       recent_spinner->value(1);
       recent_spinner->callback((Fl_Callback*)cb_recent_spinner);
@@ -280,6 +290,10 @@ Fl_Double_Window* make_settings_window() {
       recent_spinner->maximum(10);
       recent_spinner->value(c);
     } // Fl_Spinner* recent_spinner
+    { Fl_Button* o = new Fl_Button(266, 205, 64, 25, "Close");
+      o->tooltip("Close this dialog.");
+      o->callback((Fl_Callback*)cb_Close1);
+    } // Fl_Button* o
     settings_window->set_non_modal();
     settings_window->end();
   } // Fl_Double_Window* settings_window
@@ -331,7 +345,7 @@ Fl_Double_Window* make_shell_window() {
     { shell_command_input = new Fl_Input(10, 27, 347, 25, "Command:");
       shell_command_input->labelfont(1);
       shell_command_input->callback((Fl_Callback*)cb_shell_command_input);
-      shell_command_input->align(FL_ALIGN_TOP_LEFT);
+      shell_command_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       char buf[1024];
       fluid_prefs.get("shell_command", buf, "", sizeof(buf));
       shell_command_input->value(buf);
@@ -404,7 +418,7 @@ Fl_Double_Window* make_layout_window() {
       horizontal_input->type(2);
       horizontal_input->box(FL_THIN_DOWN_BOX);
       horizontal_input->callback((Fl_Callback*)grid_cb, (void*)(1));
-      horizontal_input->align(FL_ALIGN_RIGHT);
+      horizontal_input->align(Fl_Align(FL_ALIGN_RIGHT));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     } // Fl_Input* horizontal_input
     { Fl_Input* o = vertical_input = new Fl_Input(166, 10, 50, 25, "pixels");
@@ -412,7 +426,7 @@ Fl_Double_Window* make_layout_window() {
       vertical_input->type(2);
       vertical_input->box(FL_THIN_DOWN_BOX);
       vertical_input->callback((Fl_Callback*)grid_cb, (void*)(2));
-      vertical_input->align(FL_ALIGN_RIGHT);
+      vertical_input->align(Fl_Align(FL_ALIGN_RIGHT));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     } // Fl_Input* vertical_input
     { Fl_Input* o = snap_input = new Fl_Input(106, 45, 50, 25, "pixel snap");
@@ -420,7 +434,7 @@ Fl_Double_Window* make_layout_window() {
       snap_input->type(2);
       snap_input->box(FL_THIN_DOWN_BOX);
       snap_input->callback((Fl_Callback*)grid_cb, (void*)(3));
-      snap_input->align(FL_ALIGN_RIGHT);
+      snap_input->align(Fl_Align(FL_ALIGN_RIGHT));
       o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);
     } // Fl_Input* snap_input
     { guides_toggle = new Fl_Check_Button(106, 80, 110, 25, "Show Guides");
@@ -434,11 +448,11 @@ Fl_Double_Window* make_layout_window() {
     } // Fl_Button* o
     { Fl_Box* o = new Fl_Box(26, 10, 70, 25, "Grid:");
       o->labelfont(1);
-      o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+      o->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE));
     } // Fl_Box* o
     { Fl_Box* o = new Fl_Box(-1, 115, 97, 25, "Widget Size:");
       o->labelfont(1);
-      o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE);
+      o->align(Fl_Align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE));
     } // Fl_Box* o
     { Fl_Group* o = new Fl_Group(105, 115, 170, 75);
       { def_widget_size[0] = new Fl_Round_Button(105, 115, 70, 25);
@@ -448,7 +462,7 @@ Fl_Double_Window* make_layout_window() {
       } // Fl_Round_Button* def_widget_size[0]
       { Fl_Box* o = new Fl_Box(120, 115, 50, 25, "tiny");
         o->labelsize(8);
-        o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+        o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
       { def_widget_size[1] = new Fl_Round_Button(180, 115, 70, 25);
         def_widget_size[1]->type(102);
@@ -457,7 +471,7 @@ Fl_Double_Window* make_layout_window() {
       } // Fl_Round_Button* def_widget_size[1]
       { Fl_Box* o = new Fl_Box(195, 115, 50, 25, "small");
         o->labelsize(11);
-        o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+        o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
       { def_widget_size[2] = new Fl_Round_Button(105, 140, 70, 25);
         def_widget_size[2]->type(102);
@@ -465,7 +479,7 @@ Fl_Double_Window* make_layout_window() {
         def_widget_size[2]->callback((Fl_Callback*)default_widget_size_cb, (void*)(14));
       } // Fl_Round_Button* def_widget_size[2]
       { Fl_Box* o = new Fl_Box(120, 140, 50, 25, "normal");
-        o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+        o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
       { def_widget_size[3] = new Fl_Round_Button(180, 140, 90, 25);
         def_widget_size[3]->type(102);
@@ -474,7 +488,7 @@ Fl_Double_Window* make_layout_window() {
       } // Fl_Round_Button* def_widget_size[3]
       { Fl_Box* o = new Fl_Box(195, 140, 68, 25, "medium");
         o->labelsize(18);
-        o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+        o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
       { def_widget_size[4] = new Fl_Round_Button(105, 165, 75, 25);
         def_widget_size[4]->type(102);
@@ -483,7 +497,7 @@ Fl_Double_Window* make_layout_window() {
       } // Fl_Round_Button* def_widget_size[4]
       { Fl_Box* o = new Fl_Box(120, 165, 64, 25, "large");
         o->labelsize(24);
-        o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+        o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
       { def_widget_size[5] = new Fl_Round_Button(180, 165, 95, 25);
         def_widget_size[5]->type(102);
@@ -492,7 +506,7 @@ Fl_Double_Window* make_layout_window() {
       } // Fl_Round_Button* def_widget_size[5]
       { Fl_Box* o = new Fl_Box(195, 165, 76, 25, "huge");
         o->labelsize(32);
-        o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+        o->align(Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE));
       } // Fl_Box* o
       o->end();
     } // Fl_Group* o

fluid/alignment_panel.fl

@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0108 
+version 1.0300 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -40,7 +40,13 @@ decl {\#include <FL/Fl_Text_Display.H>} {public
 decl {extern void load_history();} {public
 } 
 
-Function {make_project_window()} {open
+decl {extern void redraw_browser();} {public
+} 
+
+decl {extern int show_comments;} {public
+} 
+
+Function {make_project_window()} {selected
 } {
   Fl_Window project_window {
     label {Project Settings}
@@ -83,7 +89,7 @@ Function {make_project_window()} {open
         }
         Fl_Check_Button use_FL_COMMAND_button {
           label {Generate menu shortcuts using FL_COMMAND}
-          callback use_FL_COMMAND_button_cb selected
+          callback use_FL_COMMAND_button_cb
           tooltip {Replace FL_CTRL with FL_COMMAND when generating menu shortcut code.} xywh {95 130 245 20} down_box DOWN_BOX labelsize 11
         }
       }
@@ -150,7 +156,7 @@ Function {make_settings_window()} {open
 } {
   Fl_Window settings_window {
     label {GUI Settings} open
-    xywh {326 145 340 225} type Double non_modal visible
+    xywh {393 191 342 242} type Double non_modal visible
   } {
     Fl_Choice scheme_choice {
       label {Scheme:}
@@ -185,13 +191,13 @@ Function {make_settings_window()} {open
 
 
 } open
-      xywh {116 45 215 100} labelfont 1 align 4
+      xywh {70 40 266 128} labelfont 1 align 4
     } {
       Fl_Check_Button tooltips_button {
         label {Show Tooltips}
         callback {Fl_Tooltip::enable(tooltips_button->value());
 fluid_prefs.set("show_tooltips", tooltips_button->value());}
-        xywh {116 45 113 25} down_box DOWN_BOX
+        xywh {116 40 113 25} down_box DOWN_BOX
         code0 {int b;}
         code1 {fluid_prefs.get("show_tooltips", b, 1);}
         code2 {tooltips_button->value(b);}
@@ -200,7 +206,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
       Fl_Check_Button completion_button {
         label {Show Completion Dialogs}
         callback {fluid_prefs.set("show_completion_dialogs", completion_button->value());}
-        xywh {116 70 186 25} down_box DOWN_BOX
+        xywh {116 65 186 25} down_box DOWN_BOX
         code0 {int b;}
         code1 {fluid_prefs.get("show_completion_dialogs", b, 1);}
         code2 {completion_button->value(b);}
@@ -208,7 +214,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
       Fl_Check_Button openlast_button {
         label {Open Previous File on Startup}
         callback {fluid_prefs.set("open_previous_file", openlast_button->value());}
-        xywh {116 95 215 25} down_box DOWN_BOX
+        xywh {115 90 215 25} down_box DOWN_BOX
         code0 {int b;}
         code1 {fluid_prefs.get("open_previous_file", b, 0);}
         code2 {openlast_button->value(b);}
@@ -216,27 +222,36 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
       Fl_Check_Button prevpos_button {
         label {Remember Window Positions}
         callback {fluid_prefs.set("prev_window_pos", prevpos_button->value());}
-        xywh {116 120 210 25} down_box DOWN_BOX
+        xywh {115 115 210 25} down_box DOWN_BOX
         code0 {int b;}
         code1 {fluid_prefs.get("prev_window_pos", b, 1);}
         code2 {prevpos_button->value(b);}
       }
-    }
-    Fl_Button {} {
-      label Close
-      callback {settings_window->hide();}
-      tooltip {Close this dialog.} xywh {266 190 64 25}
+      Fl_Check_Button show_comments_button {
+        label {Show Comments in Browser}
+        callback {show_comments = show_comments_button->value();
+fluid_prefs.set("show_comments", show_comments);
+redraw_browser();}
+        xywh {115 140 210 25} down_box DOWN_BOX
+        code1 {fluid_prefs.get("show_comments", show_comments, 1);}
+        code2 {show_comments_button->value(show_comments);}
+      }
     }
     Fl_Spinner recent_spinner {
       label {\# Recent Files:}
       callback {fluid_prefs.set("recent_files", recent_spinner->value());
 load_history();}
-      xywh {116 155 40 25} labelfont 1 when 1 value 1
+      xywh {115 170 40 25} labelfont 1 when 1 value 1
       code0 {int c;}
       code1 {fluid_prefs.get("recent_files", c, 5);}
       code2 {recent_spinner->maximum(10);}
       code3 {recent_spinner->value(c);}
     }
+    Fl_Button {} {
+      label Close
+      callback {settings_window->hide();}
+      tooltip {Close this dialog.} xywh {266 205 64 25}
+    }
   }
 } 
 
@@ -309,7 +324,7 @@ Function {make_shell_window()} {open
 Function {make_layout_window()} {open
 } {
   Fl_Window grid_window {
-    label {Layout Settings}
+    label {Layout Settings} open
     xywh {676 337 285 245} type Double non_modal visible
   } {
     Fl_Input horizontal_input {

fluid/alignment_panel.h

@@ -33,6 +33,8 @@
 #include <FL/Fl_Text_Buffer.H>
 #include <FL/Fl_Text_Display.H>
 extern void load_history();
+extern void redraw_browser();
+extern int show_comments;
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Tooltip.H>
@@ -72,6 +74,7 @@ extern Fl_Check_Button *tooltips_button;
 extern Fl_Check_Button *completion_button;
 extern Fl_Check_Button *openlast_button;
 extern Fl_Check_Button *prevpos_button;
+extern Fl_Check_Button *show_comments_button;
 #include <FL/Fl_Spinner.H>
 extern Fl_Spinner *recent_spinner;
 Fl_Double_Window* make_settings_window();

fluid/fluid.cxx

@@ -98,6 +98,7 @@ int gridx = 5;
 int gridy = 5;
 int snap = 1;
 int show_guides = 1;
+int show_comments = 1;
 
 // File history info...
 char	absolute_history[10][1024];
@@ -1747,6 +1748,7 @@ void make_main_window() {
   fluid_prefs.get("gridy", gridy, 5);
   fluid_prefs.get("show_guides", show_guides, 0);
   fluid_prefs.get("widget_size", Fl_Widget_Type::default_size, 14);
+  fluid_prefs.get("show_comments", show_comments, 1);
 
   load_history();
 

fluid/function_panel.cxx

@@ -934,17 +934,6 @@ Fl_Light_Button *sv_autorefresh=(Fl_Light_Button *)0;
 
 Fl_Light_Button *sv_autoposition=(Fl_Light_Button *)0;
 
-/**
-   Create a preview window for the C++ source code.
-   
-   This function creates a dialog box with two tabs
-   for previewing thw header and source file that will
-   be generated from the current database.
-   
-   The created window is modal.
-   
-   \return the newly created dialog window
-*/
 Fl_Double_Window* make_sourceview() {
   { sourceview_panel = new Fl_Double_Window(520, 490, "Code View");
     sourceview_panel->callback((Fl_Callback*)toggle_sourceview_cb);

fluid/function_panel.fl

@@ -429,8 +429,7 @@ Function {type_make_cb(Fl_Widget*,void*d)} {return_type void
   }} {}
 } 
 
-Function {make_widgetbin()} {selected
-} {
+Function {make_widgetbin()} {} {
   Fl_Window widgetbin_panel {
     label {Widget Bin}
     xywh {411 171 550 85} type Single align 80 non_modal visible
@@ -764,16 +763,7 @@ Function {make_widgetbin()} {selected
   }
 } 
 
-Function {make_sourceview()} {
-  comment {Create a preview window for the C++ source code.
-
-This function creates a dialog box with two tabs
-for previewing thw header and source file that will
-be generated from the current database.
-
-The created window is modal.
-
-\\return the newly created dialog window}
+Function {make_sourceview()} {selected
 } {
   Fl_Window sourceview_panel {
     label {Code View}

fluid/template_panel.fl

@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0107 
+version 1.0300 
 header_name {.h} 
 code_name {.cxx}
 comment {//
@@ -47,7 +47,7 @@ decl {\#include <FL/Fl_Shared_Image.H>} {}
 
 decl {\#include <FL/Fl_Preferences.H>} {} 
 
-declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {selected after {\#endif // WIN32 && !__CYGWIN__}
+declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {after {\#endif // WIN32 && !__CYGWIN__}
 } {
   decl {\#include <io.h>} {}
   decl {\#else} {}
@@ -56,8 +56,7 @@ declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {selected after {\#endif
 
 decl {extern Fl_Preferences fluid_prefs;} {} 
 
-Function {make_template_panel()} {open
-} {
+Function {make_template_panel()} {} {
   Fl_Window template_panel {
     label {New/Save Template}
     callback {Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image();
@@ -182,7 +181,7 @@ template_browser->deselect();
 template_browser->clear();} {}
 } 
 
-Function {template_delete_cb(Fl_Button *, void *)} {return_type void
+Function {template_delete_cb(Fl_Button *, void *)} {selected return_type void
 } {
   code {int item = template_browser->value();
 if (item < 1) return;
@@ -203,7 +202,7 @@ template_browser->remove(item);
 template_browser->do_callback();} {}
 } 
 
-Function {template_load()} {open return_type void
+Function {template_load()} {return_type void
 } {
   code {int i;
 char name[1024], filename[1024], path[1024], *ptr;