revert

Author: MoAlyousef

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fl2rust"
-version = "0.5.3"
+version = "0.5.4"
 authors = ["Mohammed Alyousef <[email protected]>"]
 edition = "2021"
 description = "A fluid (fltk ui designer) file to Rust transpiler"

fl_tests/col.fl

@@ -9,7 +9,7 @@ class UserInterface {open
     Fl_Window {} {open selected
       xywh {190 213 510 360} type Double resizable visible
     } {
-      Fl_Box b {
+      Fl_Button b {
         label button
         image {../fltk-rs/screenshots/calc.jpg} xywh {25 25 220 145} box BORDER_BOX shortcut 0x4006e color 87 labeltype SHADOW_LABEL labelfont 11 when 1 resizable
       }

src/gen.rs

@@ -469,20 +469,16 @@ fn add_funcs(functions: &[Function], free: bool, named: &mut Vec<(String, String
         if !c.widgets.is_empty() {
             func += &add_widgets(None, &c.widgets, named);
         }
-        if !free {
-            func += "\tSelf {\n";
-        } else if let Some(ret) = &c.props.return_type {
-            writeln!(func, "\t{} {{", ret).unwrap();
-        }
-        if !named.is_empty() && (c.props.return_type.is_some() || !free) {
+        func += "\tSelf {\n";
+        if !named.is_empty() {
             for n in named.iter() {
                 func += "\t    ";
                 func += &n.0;
                 func += ",\n";
             }
-            func += "\t}\n";
         }
-        func += "    }";
+        func += "\t}";
+        func += "\n    }";
     }
     func
 }
@@ -564,4 +560,4 @@ pub fn generate(ast: &Ast) -> String {
 pub fn generate_with_directives_preamble(ast: &Ast) -> String {
     let s = generate_(ast);
     format!("{}\n{}\n{}", ALLOWS, HEADER, s)
-}
+}