1 files changed, 20 insertions, 20 deletions
diff --git a/fluid/nodes/Menu_Node.h b/fluid/nodes/Menu_Node.h
index 181ab8243..4bf27ed34 100644
--- a/fluid/nodes/Menu_Node.h
+++ b/fluid/nodes/Menu_Node.h
@@ -67,8 +67,8 @@ public:
   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 Type::Menu_Item; }
-  bool is_a(Type inType) const override { return (inType==Type::Menu_Item) ? true : super::is_a(inType); }
+  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); }
 };
 
 /**
@@ -82,8 +82,8 @@ public:
 public:
   const char* type_name() override {return "RadioMenuItem";}
   Node* make(Strategy strategy) override;
-  Type type() const override { return Type::Radio_Menu_Item; }
-  bool is_a(Type inType) const override { return (inType==Type::Radio_Menu_Item) ? true : super::is_a(inType); }
+  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); }
 };
 
 /**
@@ -97,8 +97,8 @@ public:
 public:
   const char* type_name() override {return "CheckMenuItem";}
   Node* make(Strategy strategy) override;
-  Type type() const override { return Type::Checkbox_Menu_Item; }
-  bool is_a(Type inType) const override { return (inType==Type::Checkbox_Menu_Item) ? true : super::is_a(inType); }
+  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); }
 };
 
 /**
@@ -125,8 +125,8 @@ public:
   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 Type::Submenu; }
-  bool is_a(Type inType) const override { return (inType==Type::Submenu) ? true : super::is_a(inType); }
+  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); }
 };
 
 // -----------------------------------------------------------------------------
@@ -156,8 +156,8 @@ public:
   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 Type::Menu_Manager_; }
-  bool is_a(Type inType) const override { return (inType==Type::Menu_Manager_) ? true : super::is_a(inType); }
+  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); }
 };
 
 /**
@@ -198,8 +198,8 @@ public:
   }
   Widget_Node *_make() override {return new Input_Choice_Node();}
   void build_menu() override;
-  Type type() const override { return Type::Input_Choice; }
-  bool is_a(Type inType) const override { return (inType==Type::Input_Choice) ? true : super::is_a(inType); }
+  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;
 };
 
@@ -228,8 +228,8 @@ public:
   }
   Node* click_test(int x, int y) override;
   void copy_properties() override;
-  Type type() const override { return Type::Menu_; }
-  bool is_a(Type inType) const override { return (inType==Type::Menu_) ? true : super::is_a(inType); }
+  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); }
 };
 
 extern Fl_Menu_Item button_type_menu[];
@@ -250,8 +250,8 @@ public:
   Fl_Widget *widget(int X,int Y,int W,int H) override {
     return new Fl_Menu_Button(X,Y,W,H,"menu");}
   Widget_Node *_make() override {return new Menu_Button_Node();}
-  Type type() const override { return Type::Menu_Button; }
-  bool is_a(Type inType) const override { return (inType==Type::Menu_Button) ? true : super::is_a(inType); }
+  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); }
 };
 
 
@@ -272,8 +272,8 @@ public:
     return myo;
   }
   Widget_Node *_make() override {return new Choice_Node();}
-  Type type() const override { return Type::Choice; }
-  bool is_a(Type inType) const override { return (inType==Type::Choice) ? true : super::is_a(inType); }
+  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); }
 };
 
 
@@ -297,8 +297,8 @@ public:
   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 Type::Menu_Bar; }
-  bool is_a(Type inType) const override { return (inType==Type::Menu_Bar) ? true : super::is_a(inType); }
+  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); }
   bool is_sys_menu_bar();
   std::string sys_menubar_name() const;
   const char *sys_menubar_proxy_name();