Fix problems with new FLUID output, add common to closing braces to show

what widget is being closed, and bump the version number to 1.1.8 in the
repo...


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

1 files changed, 6 insertions, 6 deletions

diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index 6638c235d..4805f0a68 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -340,15 +340,15 @@ void Fl_Function_Type::write_code1() {
 }
 
 void Fl_Function_Type::write_code2() {
+  Fl_Type *child;
+  const char *var = "w";
+  for (child = next; child && child->level > level; child = child->next)
+    if (child->is_window() && child->name()) var = child->name();
+
   if (ismain()) {
-    if (havewidgets) write_c("  w->show(argc, argv);\n");
+    if (havewidgets) write_c("  %s->show(argc, argv);\n", var);
     write_c("  return Fl::run();\n");
   } else if (havewidgets && !constructor && !return_type) {
-    Fl_Type *child;
-    const char *var = "w";
-    for (child = next; child && child->level > level; child = child->next)
-      if (child->is_window() && child->name()) var = child->name();
-
     write_c("  return %s;\n", var);
   }
   write_c("}\n");