diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx
index 0fac8500a..f6b7ff78a 100644
--- a/fluid/Fl_Group_Type.cxx
+++ b/fluid/Fl_Group_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Group_Type.cxx,v 1.4.2.1 1999/03/29 17:39:24 carl Exp $"
+// "$Id: Fl_Group_Type.cxx,v 1.4.2.2 1999/04/18 14:10:55 gustavo Exp $"
 //
 // Fl_Group object code for the Fast Light Tool Kit (FLTK).
 //
@@ -121,9 +121,10 @@ void Fl_Group_Type::write_code1() {
 }
 
 void Fl_Group_Type::write_code2() {
+  write_extra_code();
   write_c("%so->end();\n", indent());
   if (resizable()) write_c("%sFl_Group::current()->resizable(o);\n", indent());
-  Fl_Widget_Type::write_code2();
+  write_block_close();
 }
 
 ////////////////////////////////////////////////////////////////
@@ -219,5 +220,5 @@ const char tile_type_name[] = "Fl_Tile";
 Fl_Tile_Type Fl_Tile_type;	// the "factory"
 
 //
-// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.1 1999/03/29 17:39:24 carl Exp $".
+// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.2 1999/04/18 14:10:55 gustavo Exp $".
 //
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h
index 3f054f154..6ce76155e 100644
--- a/fluid/Fl_Type.h
+++ b/fluid/Fl_Type.h
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.h,v 1.5.2.1 1999/03/29 17:39:25 carl Exp $"
+// "$Id: Fl_Type.h,v 1.5.2.2 1999/04/18 14:10:53 gustavo Exp $"
 //
 // Widget type header file for the Fast Light Tool Kit (FLTK).
 //
@@ -239,6 +239,8 @@ protected:
   void write_static();
   void write_code1();
   void write_widget_code();
+  void write_extra_code();
+  void write_block_close();
   void write_code2();
 
 public:
@@ -523,5 +525,5 @@ int storestring(const char *n, const char * & p, int nostrip=0);
 extern int include_H_from_C;
 
 //
-// End of "$Id: Fl_Type.h,v 1.5.2.1 1999/03/29 17:39:25 carl Exp $".
+// End of "$Id: Fl_Type.h,v 1.5.2.2 1999/04/18 14:10:53 gustavo Exp $".
 //
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 7fbcada76..fa5a813eb 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.1 1999/04/10 09:14:34 bill Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.2 1999/04/18 14:10:53 gustavo Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -1427,13 +1427,20 @@ void Fl_Widget_Type::write_widget_code() {
     write_c("%sw->hotspot(o);\n", indent());
 }
 
-void Fl_Widget_Type::write_code2() {
-  indentation -= 2;
-  if (!is_parent() && !varused) return;
+void Fl_Widget_Type::write_extra_code() {
   for (int n=0; n < NUM_EXTRA_CODE; n++)
     if (extra_code(n) && !isdeclare(extra_code(n)))
-      write_c("%s  %s\n", indent(), extra_code(n));
-  write_c("%s}\n", indent());
+      write_c("%s%s\n", indent(), extra_code(n));
+}
+
+void Fl_Widget_Type::write_block_close() {
+  indentation -= 2;
+  if (is_parent() || varused) write_c("%s}\n", indent());
+}
+
+void Fl_Widget_Type::write_code2() {
+  write_extra_code();
+  write_block_close();
 }
 
 ////////////////////////////////////////////////////////////////
@@ -1738,5 +1745,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.1 1999/04/10 09:14:34 bill Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.2 1999/04/18 14:10:53 gustavo Exp $".
 //
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index dd3757d7e..4e34dfc2b 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Window_Type.cxx,v 1.13.2.1 1999/03/29 17:39:26 carl Exp $"
+// "$Id: Fl_Window_Type.cxx,v 1.13.2.2 1999/04/18 14:10:55 gustavo Exp $"
 //
 // Window type code for the Fast Light Tool Kit (FLTK).
 //
@@ -593,13 +593,14 @@ void Fl_Window_Type::write_code1() {
 }
 
 void Fl_Window_Type::write_code2() {
+  write_extra_code();
   if (modal) write_c("%so->set_modal();\n", indent());
   else if (non_modal) write_c("%so->set_non_modal();\n", indent());
   if (!((Fl_Window*)o)->border()) write_c("%so->clear_border();\n", indent());
   write_c("%so->end();\n", indent());
   if (((Fl_Window*)o)->resizable() == o)
     write_c("%so->resizable(o);\n", indent());
-  Fl_Widget_Type::write_code2();
+  write_block_close();
 }
 
 void Fl_Window_Type::write_properties() {
@@ -652,5 +653,5 @@ int Fl_Window_Type::read_fdesign(const char* name, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.1 1999/03/29 17:39:26 carl Exp $".
+// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.2 1999/04/18 14:10:55 gustavo Exp $".
 //