wip

1 files changed, 84 insertions, 84 deletions

diff --git a/fluid/nodes/Menu_Node.h b/fluid/nodes/Menu_Node.h
index 42484ed43..b0e46afca 100644
--- a/fluid/nodes/Menu_Node.h
+++ b/fluid/nodes/Menu_Node.h
@@ -52,23 +52,23 @@ public:
   typedef Button_Node super;
   static Menu_Item_Node prototype;
 public:
-  Fl_Menu_Item* subtypes() override {return menu_item_type_menu;}
-  const char* type_name() override {return "MenuItem";}
-  const char* alt_type_name() override {return "fltk::Item";}
-  Node* make(Strategy strategy) override;
+  Fl_Menu_Item* subtypes() {return menu_item_type_menu;}
+  const char* type_name() {return "MenuItem";}
+  const char* alt_type_name() {return "fltk::Item";}
+  Node* make(Strategy strategy);
   Node* make(int flags, Strategy strategy);
-  int is_button() const override {return 1;} // this gets shortcut to work
-  Fl_Widget* widget(int,int,int,int) override {return 0;}
-  Widget_Node* _make() override {return 0;}
+  int is_button() const {return 1;} // this gets shortcut to work
+  Fl_Widget* widget(int,int,int,int) {return 0;}
+  Widget_Node* _make() {return 0;}
   virtual const char* menu_name(fld::io::Code_Writer& f, int& i);
   int flags();
-  void write_static(fld::io::Code_Writer& f) override;
+  void write_static(fld::io::Code_Writer& f);
   void write_item(fld::io::Code_Writer& f);
-  void write_code1(fld::io::Code_Writer& f) override;
-  void write_code2(fld::io::Code_Writer& f) override;
-  int is_true_widget() const override { return 0; }
-  Type type() const override { return FLD_NODE_TYPE_Menu_Item; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Menu_Item) ? true : super::is_a(inType); }
+  void write_code1(fld::io::Code_Writer& f);
+  void write_code2(fld::io::Code_Writer& f);
+  int is_true_widget() const { return 0; }
+  Type type() const { return FLD_NODE_TYPE_Menu_Item; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Menu_Item) ? true : super::is_a(inType); }
 };
 
 /**
@@ -80,10 +80,10 @@ public:
   typedef Menu_Item_Node super;
   static Radio_Menu_Item_Node prototype;
 public:
-  const char* type_name() override {return "RadioMenuItem";}
-  Node* make(Strategy strategy) override;
-  Type type() const override { return FLD_NODE_TYPE_Radio_Menu_Item; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Radio_Menu_Item) ? true : super::is_a(inType); }
+  const char* type_name() {return "RadioMenuItem";}
+  Node* make(Strategy strategy);
+  Type type() const { return FLD_NODE_TYPE_Radio_Menu_Item; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Radio_Menu_Item) ? true : super::is_a(inType); }
 };
 
 /**
@@ -95,10 +95,10 @@ public:
   typedef Menu_Item_Node super;
   static Checkbox_Menu_Item_Node prototype;
 public:
-  const char* type_name() override {return "CheckMenuItem";}
-  Node* make(Strategy strategy) override;
-  Type type() const override { return FLD_NODE_TYPE_Checkbox_Menu_Item; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Checkbox_Menu_Item) ? true : super::is_a(inType); }
+  const char* type_name() {return "CheckMenuItem";}
+  Node* make(Strategy strategy);
+  Type type() const { return FLD_NODE_TYPE_Checkbox_Menu_Item; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Checkbox_Menu_Item) ? true : super::is_a(inType); }
 };
 
 /**
@@ -114,19 +114,19 @@ public:
   typedef Menu_Item_Node super;
   static Submenu_Node prototype;
 public:
-  Fl_Menu_Item* subtypes() override {return 0;}
-  const char* type_name() override {return "Submenu";}
-  const char* alt_type_name() override {return "fltk::ItemGroup";}
-  int can_have_children() const override {return 1;}
-  int is_button() const override {return 0;} // disable shortcut
-  Node* make(Strategy strategy) override;
+  Fl_Menu_Item* subtypes() {return 0;}
+  const char* type_name() {return "Submenu";}
+  const char* alt_type_name() {return "fltk::ItemGroup";}
+  int can_have_children() const {return 1;}
+  int is_button() const {return 0;} // disable shortcut
+  Node* make(Strategy strategy);
   // changes to submenu must propagate up so build_menu is called
   // on the parent Menu_Node:
-  void add_child(Node*a, Node*b) override {parent->add_child(a,b);}
-  void move_child(Node*a, Node*b) override {parent->move_child(a,b);}
-  void remove_child(Node*a) override {parent->remove_child(a);}
-  Type type() const override { return FLD_NODE_TYPE_Submenu; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Submenu) ? true : super::is_a(inType); }
+  void add_child(Node*a, Node*b) {parent->add_child(a,b);}
+  void move_child(Node*a, Node*b) {parent->move_child(a,b);}
+  void remove_child(Node*a) {parent->remove_child(a);}
+  Type type() const { return FLD_NODE_TYPE_Submenu; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Submenu) ? true : super::is_a(inType); }
 };
 
 // -----------------------------------------------------------------------------
@@ -140,24 +140,24 @@ class Menu_Manager_Node : public Widget_Node
 {
   typedef Widget_Node super;
 public:
-  void ideal_size(int &w, int &h) override {
-    auto layout = Fluid.proj.layout;
+  void ideal_size(int &w, int &h) {
+    fld::app::Layout_Preset *layout = Fluid.proj.layout;
     h = layout->textsize_not_null() + 8;
     w = layout->textsize_not_null() * 6 + 8;
     fld::app::Snap_Action::better_size(w, h);
   }
-  int can_have_children() const override {return 1;}
+  int can_have_children() const {return 1;}
   int menusize;
   virtual void build_menu() = 0;
   Menu_Manager_Node() : Widget_Node() {menusize = 0;}
-  void add_child(Node*, Node*) override { build_menu(); }
-  void move_child(Node*, Node*) override { build_menu(); }
-  void remove_child(Node*) override { build_menu();}
-  Node* click_test(int x, int y) override = 0;
-  void write_code2(fld::io::Code_Writer& f) override;
-  void copy_properties() override = 0;
-  Type type() const override { return FLD_NODE_TYPE_Menu_Manager_; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Menu_Manager_) ? true : super::is_a(inType); }
+  void add_child(Node*, Node*) { build_menu(); }
+  void move_child(Node*, Node*) { build_menu(); }
+  void remove_child(Node*) { build_menu();}
+  Node* click_test(int x, int y) = 0;
+  void write_code2(fld::io::Code_Writer& f);
+  void copy_properties() = 0;
+  Type type() const { return FLD_NODE_TYPE_Menu_Manager_; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Menu_Manager_) ? true : super::is_a(inType); }
 };
 
 /**
@@ -172,7 +172,7 @@ public:
   typedef Menu_Manager_Node super;
   static Input_Choice_Node prototype;
 private:
-  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) override {
+  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
     Fl_Input_Choice *myo = (Fl_Input_Choice*)(w==4 ? ((Widget_Node*)this->factory)->o : this->o);
     switch (w) {
       case 4:
@@ -187,20 +187,20 @@ public:
   ~Input_Choice_Node() {
     if (menusize) delete[] (Fl_Menu_Item*)(((Fl_Input_Choice*)o)->menu());
   }
-  const char *type_name() override {return "Fl_Input_Choice";}
-  const char *alt_type_name() override {return "fltk::ComboBox";}
-  Node* click_test(int,int) override;
-  Fl_Widget *widget(int X,int Y,int W,int H) override {
+  const char *type_name() {return "Fl_Input_Choice";}
+  const char *alt_type_name() {return "fltk::ComboBox";}
+  Node* click_test(int,int);
+  Fl_Widget *widget(int X,int Y,int W,int H) {
     Fl_Input_Choice *myo = new Fl_Input_Choice(X,Y,W,H,"input choice:");
     myo->menu(dummymenu);
     myo->value("input");
     return myo;
   }
-  Widget_Node *_make() override {return new Input_Choice_Node();}
-  void build_menu() override;
-  Type type() const override { return FLD_NODE_TYPE_Input_Choice; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Input_Choice) ? true : super::is_a(inType); }
-  void copy_properties() override;
+  Widget_Node *_make() {return new Input_Choice_Node();}
+  void build_menu();
+  Type type() const { return FLD_NODE_TYPE_Input_Choice; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Input_Choice) ? true : super::is_a(inType); }
+  void copy_properties();
 };
 
 /**
@@ -209,7 +209,7 @@ public:
 class Menu_Base_Node : public Menu_Manager_Node
 {
   typedef Menu_Manager_Node super;
-  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) override {
+  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
     Fl_Menu_ *myo = (Fl_Menu_*)(w==4 ? ((Widget_Node*)this->factory)->o : this->o);
     switch (w) {
       case 4:
@@ -221,15 +221,15 @@ class Menu_Base_Node : public Menu_Manager_Node
     return 1;
   }
 public:
-  int can_have_children() const override {return 1;}
-  void build_menu() override;
+  int can_have_children() const {return 1;}
+  void build_menu();
   ~Menu_Base_Node() {
     if (menusize) delete[] (Fl_Menu_Item*)(((Fl_Menu_*)o)->menu());
   }
-  Node* click_test(int x, int y) override;
-  void copy_properties() override;
-  Type type() const override { return FLD_NODE_TYPE_Menu_; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Menu_) ? true : super::is_a(inType); }
+  Node* click_test(int x, int y);
+  void copy_properties();
+  Type type() const { return FLD_NODE_TYPE_Menu_; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Menu_) ? true : super::is_a(inType); }
 };
 
 extern Fl_Menu_Item button_type_menu[];
@@ -243,15 +243,15 @@ public:
   typedef Menu_Base_Node super;
   static Menu_Button_Node prototype;
 private:
-  Fl_Menu_Item *subtypes() override {return button_type_menu;}
+  Fl_Menu_Item *subtypes() {return button_type_menu;}
 public:
-  const char *type_name() override {return "Fl_Menu_Button";}
-  const char *alt_type_name() override {return "fltk::MenuButton";}
-  Fl_Widget *widget(int X,int Y,int W,int H) override {
+  const char *type_name() {return "Fl_Menu_Button";}
+  const char *alt_type_name() {return "fltk::MenuButton";}
+  Fl_Widget *widget(int X,int Y,int W,int H) {
     return new Fl_Menu_Button(X,Y,W,H,"menu");}
-  Widget_Node *_make() override {return new Menu_Button_Node();}
-  Type type() const override { return FLD_NODE_TYPE_Menu_Button; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Menu_Button) ? true : super::is_a(inType); }
+  Widget_Node *_make() {return new Menu_Button_Node();}
+  Type type() const { return FLD_NODE_TYPE_Menu_Button; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Menu_Button) ? true : super::is_a(inType); }
 };
 
 
@@ -264,16 +264,16 @@ public:
   typedef Menu_Base_Node super;
   static Choice_Node prototype;
 public:
-  const char *type_name() override {return "Fl_Choice";}
-  const char *alt_type_name() override {return "fltk::Choice";}
-  Fl_Widget *widget(int X,int Y,int W,int H) override {
+  const char *type_name() {return "Fl_Choice";}
+  const char *alt_type_name() {return "fltk::Choice";}
+  Fl_Widget *widget(int X,int Y,int W,int H) {
     Fl_Choice *myo = new Fl_Choice(X,Y,W,H,"choice:");
     myo->menu(dummymenu);
     return myo;
   }
-  Widget_Node *_make() override {return new Choice_Node();}
-  Type type() const override { return FLD_NODE_TYPE_Choice; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Choice) ? true : super::is_a(inType); }
+  Widget_Node *_make() {return new Choice_Node();}
+  Type type() const { return FLD_NODE_TYPE_Choice; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Choice) ? true : super::is_a(inType); }
 };
 
 
@@ -286,19 +286,19 @@ public:
   typedef Menu_Base_Node super;
   static Menu_Bar_Node prototype;
 private:
-  Fl_Menu_Item *subtypes() override {return menu_bar_type_menu;}
+  Fl_Menu_Item *subtypes() {return menu_bar_type_menu;}
 public:
   Menu_Bar_Node();
-  ~Menu_Bar_Node() override;
-  const char *type_name() override {return "Fl_Menu_Bar";}
-  const char *alt_type_name() override {return "fltk::MenuBar";}
-  Fl_Widget *widget(int X,int Y,int W,int H) override {return new Fl_Menu_Bar(X,Y,W,H);}
-  Widget_Node *_make() override {return new Menu_Bar_Node();}
-  void write_static(fld::io::Code_Writer& f) override;
-  void write_code1(fld::io::Code_Writer& f) override;
-//  void write_code2(fld::io::Code_Writer& f) override;
-  Type type() const override { return FLD_NODE_TYPE_Menu_Bar; }
-  bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Menu_Bar) ? true : super::is_a(inType); }
+  ~Menu_Bar_Node();
+  const char *type_name() {return "Fl_Menu_Bar";}
+  const char *alt_type_name() {return "fltk::MenuBar";}
+  Fl_Widget *widget(int X,int Y,int W,int H) {return new Fl_Menu_Bar(X,Y,W,H);}
+  Widget_Node *_make() {return new Menu_Bar_Node();}
+  void write_static(fld::io::Code_Writer& f);
+  void write_code1(fld::io::Code_Writer& f);
+//  void write_code2(fld::io::Code_Writer& f);
+  Type type() const { return FLD_NODE_TYPE_Menu_Bar; }
+  bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Menu_Bar) ? true : super::is_a(inType); }
   int is_sys_menu_bar();
   const char* sys_menubar_name() const;
   const char *sys_menubar_proxy_name();