diff options
Diffstat (limited to 'fluid/nodes/Menu_Node.h')
| -rw-r--r-- | fluid/nodes/Menu_Node.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fluid/nodes/Menu_Node.h b/fluid/nodes/Menu_Node.h index 4bf27ed34..42484ed43 100644 --- a/fluid/nodes/Menu_Node.h +++ b/fluid/nodes/Menu_Node.h @@ -58,8 +58,8 @@ public: Node* make(Strategy strategy) override; 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 nullptr;} - Widget_Node* _make() override {return nullptr;} + Fl_Widget* widget(int,int,int,int) override {return 0;} + Widget_Node* _make() override {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; @@ -114,7 +114,7 @@ public: typedef Menu_Item_Node super; static Submenu_Node prototype; public: - Fl_Menu_Item* subtypes() override {return nullptr;} + 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;} @@ -299,8 +299,8 @@ public: // 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); } - bool is_sys_menu_bar(); - std::string sys_menubar_name() const; + int is_sys_menu_bar(); + const char* sys_menubar_name() const; const char *sys_menubar_proxy_name(); protected: char *_proxy_name; |