wip

1 files changed, 93 insertions, 93 deletions

diff --git a/fluid/nodes/Group_Node.h b/fluid/nodes/Group_Node.h
index 71df8aa46..bf630815c 100644
--- a/fluid/nodes/Group_Node.h
+++ b/fluid/nodes/Group_Node.h
@@ -40,8 +40,8 @@ void ungroup_cb(Fl_Widget *, void *);
 class Fl_Group_Proxy : public Fl_Group {
 public:
   Fl_Group_Proxy(int X,int Y,int W,int H) : Fl_Group(X, Y, W, H) { Fl_Group::current(0); }
-  void resize(int x, int y, int w, int h) override;
-  void draw() override;
+  void resize(int x, int y, int w, int h);
+  void draw();
 };
 
 class Group_Node : public Widget_Node
@@ -50,23 +50,23 @@ public:
   typedef Widget_Node super;
   static Group_Node prototype;
 public:
-  void ideal_size(int &w, int &h) override;
-  const char *type_name() override {return "Fl_Group";}
-  const char *alt_type_name() override {return "fltk::Group";}
-  Fl_Widget *widget(int X,int Y,int W,int H) override {
+  void ideal_size(int &w, int &h);
+  const char *type_name() {return "Fl_Group";}
+  const char *alt_type_name() {return "fltk::Group";}
+  Fl_Widget *widget(int X,int Y,int W,int H) {
     Fl_Group_Proxy *g = new Fl_Group_Proxy(X,Y,W,H); Fl_Group::current(0); return g;}
-  Widget_Node *_make() override {return new Group_Node();}
-  void write_code1(fld::io::Code_Writer& f) override;
-  void write_code2(fld::io::Code_Writer& f) override;
-  void add_child(Node*, Node*) override;
-  void move_child(Node*, Node*) override;
-  void remove_child(Node*) override;
-  int can_have_children() const override {return 1;}
-  Type type() const override { return FLD_NODE_TYPE_Group; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Group) ? true : super::is_a(inType); }
-  Fl_Widget *enter_live_mode(int top=0) override;
-  void leave_live_mode() override;
-  void copy_properties() override;
+  Widget_Node *_make() {return new Group_Node();}
+  void write_code1(fld::io::Code_Writer& f);
+  void write_code2(fld::io::Code_Writer& f);
+  void add_child(Node*, Node*);
+  void move_child(Node*, Node*);
+  void remove_child(Node*);
+  int can_have_children() const {return 1;}
+  Type type() const { return FLD_NODE_TYPE_Group; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Group) ? true : super::is_a(inType); }
+  Fl_Widget *enter_live_mode(int top=0);
+  void leave_live_mode();
+  void copy_properties();
 };
 
 // ---- Pack_Node --------------------------------------------------- MARK: -
@@ -80,15 +80,15 @@ public:
   typedef Group_Node super;
   static Pack_Node prototype;
 private:
-  Fl_Menu_Item *subtypes() override {return pack_type_menu;}
+  Fl_Menu_Item *subtypes() {return pack_type_menu;}
 public:
-  const char *type_name() override {return pack_type_name;}
-  const char *alt_type_name() override {return "fltk::PackedGroup";}
-  Widget_Node *_make() override {return new Pack_Node();}
-  Type type() const override { return FLD_NODE_TYPE_Pack; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Pack) ? true : super::is_a(inType); }
-  Fl_Widget *enter_live_mode(int top=0) override;
-  void copy_properties() override;
+  const char *type_name() {return pack_type_name;}
+  const char *alt_type_name() {return "fltk::PackedGroup";}
+  Widget_Node *_make() {return new Pack_Node();}
+  Type type() const { return FLD_NODE_TYPE_Pack; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Pack) ? true : super::is_a(inType); }
+  Fl_Widget *enter_live_mode(int top=0);
+  void copy_properties();
 };
 
 // ---- Flex_Node --------------------------------------------------- MARK: -
@@ -99,8 +99,8 @@ extern Fl_Menu_Item flex_type_menu[];
 class Fl_Flex_Proxy : public Fl_Flex {
 public:
   Fl_Flex_Proxy(int X,int Y,int W,int H) : Fl_Flex(X, Y, W, H) { Fl_Group::current(0); }
-  void resize(int x, int y, int w, int h) override;
-  void draw() override;
+  void resize(int x, int y, int w, int h);
+  void draw();
 };
 
 class Flex_Node : public Group_Node
@@ -109,30 +109,30 @@ public:
   typedef Group_Node super;
   static Flex_Node prototype;
 private:
-  Fl_Menu_Item *subtypes() override {return flex_type_menu;}
+  Fl_Menu_Item *subtypes() {return flex_type_menu;}
   int fixedSizeTupleSize; /* number of pairs in array */
   int *fixedSizeTuple; /* [ index, size, index2, size2, ... ] */
   int suspend_auto_layout;
 public:
   Flex_Node() : fixedSizeTupleSize(0), fixedSizeTuple(0), suspend_auto_layout(0) { }
-  const char *type_name() override {return flex_type_name;}
-  const char *alt_type_name() override {return "fltk::FlexGroup";}
-  Widget_Node *_make() override { return new Flex_Node(); }
-  Fl_Widget *widget(int X,int Y,int W,int H) override {
+  const char *type_name() {return flex_type_name;}
+  const char *alt_type_name() {return "fltk::FlexGroup";}
+  Widget_Node *_make() { return new Flex_Node(); }
+  Fl_Widget *widget(int X,int Y,int W,int H) {
     Fl_Flex *g = new Fl_Flex_Proxy(X,Y,W,H); Fl_Group::current(0); return g;}
-  Type type() const override { return FLD_NODE_TYPE_Flex; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Flex) ? true : super::is_a(inType); }
-  void write_properties(fld::io::Project_Writer &f) override;
-  void read_property(fld::io::Project_Reader &f, const char *) override;
-  Fl_Widget *enter_live_mode(int top=0) override;
-  void copy_properties() override;
-  void copy_properties_for_children() override;
-  void postprocess_read() override;
-  void write_code2(fld::io::Code_Writer& f) override;
-//  void add_child(Node*, Node*) override;
-//  void move_child(Node*, Node*) override;
-  void remove_child(Node*) override;
-  void layout_widget() override;
+  Type type() const { return FLD_NODE_TYPE_Flex; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Flex) ? true : super::is_a(inType); }
+  void write_properties(fld::io::Project_Writer &f);
+  void read_property(fld::io::Project_Reader &f, const char *);
+  Fl_Widget *enter_live_mode(int top=0);
+  void copy_properties();
+  void copy_properties_for_children();
+  void postprocess_read();
+  void write_code2(fld::io::Code_Writer& f);
+//  void add_child(Node*, Node*);
+//  void move_child(Node*, Node*);
+  void remove_child(Node*);
+  void layout_widget();
   void change_subtype_to(int n);
   void insert_child_at(Fl_Widget *child, int x, int y);
   void keyboard_move_child(Widget_Node*, int key);
@@ -149,17 +149,17 @@ public:
   typedef Group_Node super;
   static Table_Node prototype;
 public:
-  void ideal_size(int &w, int &h) override;
-  const char *type_name() override { return "Fl_Table"; }
-  const char *alt_type_name() override { return "fltk::TableGroup"; }
-  Widget_Node *_make() override { return new Table_Node(); }
-  Fl_Widget *widget(int X, int Y, int W, int H) override;
-  Type type() const override { return FLD_NODE_TYPE_Table; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Table) ? true : super::is_a(inType); }
-  Fl_Widget *enter_live_mode(int top=0) override;
-  void add_child(Node*, Node*) override;
-  void move_child(Node*, Node*) override;
-  void remove_child(Node*) override;
+  void ideal_size(int &w, int &h);
+  const char *type_name() { return "Fl_Table"; }
+  const char *alt_type_name() { return "fltk::TableGroup"; }
+  Widget_Node *_make() { return new Table_Node(); }
+  Fl_Widget *widget(int X, int Y, int W, int H);
+  Type type() const { return FLD_NODE_TYPE_Table; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Table) ? true : super::is_a(inType); }
+  Fl_Widget *enter_live_mode(int top=0);
+  void add_child(Node*, Node*);
+  void move_child(Node*, Node*);
+  void remove_child(Node*);
 };
 
 // ---- Tabs_Node --------------------------------------------------- MARK: -
@@ -169,8 +169,8 @@ extern const char tabs_type_name[];
 class Fl_Tabs_Proxy : public Fl_Tabs {
 public:
   Fl_Tabs_Proxy(int X,int Y,int W,int H) : Fl_Tabs(X,Y,W,H) {}
-  void resize(int,int,int,int) override;
-  void draw() override;
+  void resize(int,int,int,int);
+  void draw();
 };
 
 class Tabs_Node : public Group_Node
@@ -179,17 +179,17 @@ public:
   typedef Group_Node super;
   static Tabs_Node prototype;
 public:
-  const char *type_name() override {return tabs_type_name;}
-  const char *alt_type_name() override {return "fltk::TabGroup";}
-  Fl_Widget *widget(int X,int Y,int W,int H) override {
+  const char *type_name() {return tabs_type_name;}
+  const char *alt_type_name() {return "fltk::TabGroup";}
+  Fl_Widget *widget(int X,int Y,int W,int H) {
     Fl_Tabs_Proxy *g = new Fl_Tabs_Proxy(X,Y,W,H); Fl_Group::current(0); return g;}
-  Widget_Node *_make() override {return new Tabs_Node();}
-  Node* click_test(int,int) override;
-  void add_child(Node*, Node*) override;
-  void remove_child(Node*) override;
-  Type type() const override { return FLD_NODE_TYPE_Tabs; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Tabs) ? true : super::is_a(inType); }
-  Fl_Widget *enter_live_mode(int top=0) override;
+  Widget_Node *_make() {return new Tabs_Node();}
+  Node* click_test(int,int);
+  void add_child(Node*, Node*);
+  void remove_child(Node*);
+  Type type() const { return FLD_NODE_TYPE_Tabs; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Tabs) ? true : super::is_a(inType); }
+  Fl_Widget *enter_live_mode(int top=0);
 };
 
 // ---- Scroll_Node ------------------------------------------------- MARK: -
@@ -203,15 +203,15 @@ public:
   typedef Group_Node super;
   static Scroll_Node prototype;
 private:
-  Fl_Menu_Item *subtypes() override {return scroll_type_menu;}
+  Fl_Menu_Item *subtypes() {return scroll_type_menu;}
 public:
-  const char *type_name() override {return scroll_type_name;}
-  const char *alt_type_name() override {return "fltk::ScrollGroup";}
-  Widget_Node *_make() override {return new Scroll_Node();}
-  Type type() const override { return FLD_NODE_TYPE_Scroll; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Scroll) ? true : super::is_a(inType); }
-  Fl_Widget *enter_live_mode(int top=0) override;
-  void copy_properties() override;
+  const char *type_name() {return scroll_type_name;}
+  const char *alt_type_name() {return "fltk::ScrollGroup";}
+  Widget_Node *_make() {return new Scroll_Node();}
+  Type type() const { return FLD_NODE_TYPE_Scroll; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Scroll) ? true : super::is_a(inType); }
+  Fl_Widget *enter_live_mode(int top=0);
+  void copy_properties();
 };
 
 // ---- Tile_Node --------------------------------------------------- MARK: -
@@ -224,14 +224,14 @@ public:
   typedef Group_Node super;
   static Tile_Node prototype;
 public:
-  const char *type_name() override {return tile_type_name;}
-  const char *alt_type_name() override {return "fltk::TileGroup";}
-  Widget_Node *_make() override {return new Tile_Node();}
-  Type type() const override { return FLD_NODE_TYPE_Tile; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Tile) ? true : super::is_a(inType); }
-  Fl_Widget *enter_live_mode(int top=0) override;
-  void leave_live_mode() override;
-  void copy_properties() override;
+  const char *type_name() {return tile_type_name;}
+  const char *alt_type_name() {return "fltk::TileGroup";}
+  Widget_Node *_make() {return new Tile_Node();}
+  Type type() const { return FLD_NODE_TYPE_Tile; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Tile) ? true : super::is_a(inType); }
+  Fl_Widget *enter_live_mode(int top=0);
+  void leave_live_mode();
+  void copy_properties();
 };
 
 // ---- Wizard_Node ------------------------------------------------- MARK: -
@@ -239,8 +239,8 @@ public:
 class Fl_Wizard_Proxy : public Fl_Wizard {
 public:
   Fl_Wizard_Proxy(int X,int Y,int W,int H) : Fl_Wizard(X,Y,W,H) {}
-  void resize(int,int,int,int) override;
-  void draw() override;
+  void resize(int,int,int,int);
+  void draw();
 };
 
 extern const char wizard_type_name[];
@@ -251,13 +251,13 @@ public:
   typedef Group_Node super;
   static Wizard_Node prototype;
 public:
-  const char *type_name() override {return wizard_type_name;}
-  const char *alt_type_name() override {return "fltk::WizardGroup";}
-  Fl_Widget *widget(int X,int Y,int W,int H) override {
+  const char *type_name() {return wizard_type_name;}
+  const char *alt_type_name() {return "fltk::WizardGroup";}
+  Fl_Widget *widget(int X,int Y,int W,int H) {
     Fl_Wizard_Proxy *g = new Fl_Wizard_Proxy(X,Y,W,H); Fl_Group::current(0); return g;}
-  Widget_Node *_make() override {return new Wizard_Node();}
-  Type type() const override { return FLD_NODE_TYPE_Wizard; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Wizard) ? true : super::is_a(inType); }
+  Widget_Node *_make() {return new Wizard_Node();}
+  Type type() const { return FLD_NODE_TYPE_Wizard; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Wizard) ? true : super::is_a(inType); }
 };
 
 #endif // FLUID_NODES_GROUP_NODE_H