diff options
Diffstat (limited to 'fluid/nodes')
| -rw-r--r-- | fluid/nodes/Button_Node.h | 92 | ||||
| -rw-r--r-- | fluid/nodes/Function_Node.h | 194 | ||||
| -rw-r--r-- | fluid/nodes/Grid_Node.h | 44 | ||||
| -rw-r--r-- | fluid/nodes/Group_Node.cxx | 2 | ||||
| -rw-r--r-- | fluid/nodes/Group_Node.h | 186 | ||||
| -rw-r--r-- | fluid/nodes/Menu_Node.h | 168 | ||||
| -rw-r--r-- | fluid/nodes/Tree.h | 2 | ||||
| -rw-r--r-- | fluid/nodes/Widget_Node.h | 34 | ||||
| -rw-r--r-- | fluid/nodes/Window_Node.cxx | 8 | ||||
| -rw-r--r-- | fluid/nodes/Window_Node.h | 74 | ||||
| -rw-r--r-- | fluid/nodes/factory.cxx | 390 |
11 files changed, 597 insertions, 597 deletions
diff --git a/fluid/nodes/Button_Node.h b/fluid/nodes/Button_Node.h index 53944d6ea..4ee88d1e1 100644 --- a/fluid/nodes/Button_Node.h +++ b/fluid/nodes/Button_Node.h @@ -28,19 +28,19 @@ public: typedef Widget_Node super; static Button_Node prototype; private: - Fl_Menu_Item *subtypes() override; + Fl_Menu_Item *subtypes(); public: - void ideal_size(int &w, int &h) override; - const char *type_name() override { return "Fl_Button"; } - const char *alt_type_name() override { return "fltk::Button"; } - Fl_Widget *widget(int x, int y, int w, int h) override; - Widget_Node *_make() override { return new Button_Node(); } - int is_button() const override { return 1; } - Type type() const override { return FLD_NODE_TYPE_Button; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Button) ? 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; - void copy_properties() override; + void ideal_size(int &w, int &h); + const char *type_name() { return "Fl_Button"; } + const char *alt_type_name() { return "fltk::Button"; } + Fl_Widget *widget(int x, int y, int w, int h); + Widget_Node *_make() { return new Button_Node(); } + int is_button() const { return 1; } + Type type() const { return FLD_NODE_TYPE_Button; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Button) ? true : super::is_a(inType); } + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + void copy_properties(); }; // ---- Return Button ---- @@ -54,13 +54,13 @@ public: typedef Button_Node super; static Return_Button_Node prototype; public: - void ideal_size(int &w, int &h) override; - const char *type_name() override { return "Fl_Return_Button"; } - const char *alt_type_name() override { return "fltk::ReturnButton"; } - Fl_Widget *widget(int x, int y, int w, int h) override; - Widget_Node *_make() override { return new Return_Button_Node(); } - Type type() const override { return FLD_NODE_TYPE_Return_Button; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Return_Button) ? true : super::is_a(inType); } + void ideal_size(int &w, int &h); + const char *type_name() { return "Fl_Return_Button"; } + const char *alt_type_name() { return "fltk::ReturnButton"; } + Fl_Widget *widget(int x, int y, int w, int h); + Widget_Node *_make() { return new Return_Button_Node(); } + Type type() const { return FLD_NODE_TYPE_Return_Button; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Return_Button) ? true : super::is_a(inType); } }; // ---- Repeat Button ---- @@ -77,12 +77,12 @@ public: typedef Button_Node super; static Repeat_Button_Node prototype; public: - const char *type_name() override { return "Fl_Repeat_Button"; } - const char *alt_type_name() override { return "fltk::RepeatButton"; } - Fl_Widget *widget(int x, int y, int w, int h) override; - Widget_Node *_make() override { return new Repeat_Button_Node(); } - Type type() const override { return FLD_NODE_TYPE_Repeat_Button; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Repeat_Button) ? true : super::is_a(inType); } + const char *type_name() { return "Fl_Repeat_Button"; } + const char *alt_type_name() { return "fltk::RepeatButton"; } + Fl_Widget *widget(int x, int y, int w, int h); + Widget_Node *_make() { return new Repeat_Button_Node(); } + Type type() const { return FLD_NODE_TYPE_Repeat_Button; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Repeat_Button) ? true : super::is_a(inType); } }; // ---- Light Button ---- @@ -96,13 +96,13 @@ public: typedef Button_Node super; static Light_Button_Node prototype; public: - void ideal_size(int &w, int &h) override; - const char *type_name() override { return "Fl_Light_Button"; } - const char *alt_type_name() override { return "fltk::LightButton"; } - Fl_Widget *widget(int x, int y, int w, int h) override; - Widget_Node *_make() override { return new Light_Button_Node(); } - Type type() const override { return FLD_NODE_TYPE_Light_Button; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Light_Button) ? true : super::is_a(inType); } + void ideal_size(int &w, int &h); + const char *type_name() { return "Fl_Light_Button"; } + const char *alt_type_name() { return "fltk::LightButton"; } + Fl_Widget *widget(int x, int y, int w, int h); + Widget_Node *_make() { return new Light_Button_Node(); } + Type type() const { return FLD_NODE_TYPE_Light_Button; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Light_Button) ? true : super::is_a(inType); } }; // ---- Check Button ---- @@ -116,13 +116,13 @@ public: typedef Button_Node super; static Check_Button_Node prototype; public: - void ideal_size(int &w, int &h) override; - const char *type_name() override { return "Fl_Check_Button"; } - const char *alt_type_name() override { return "fltk::CheckButton"; } - Fl_Widget *widget(int x, int y, int w, int h) override; - Widget_Node *_make() override { return new Check_Button_Node(); } - Type type() const override { return FLD_NODE_TYPE_Check_Button; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Check_Button) ? true : super::is_a(inType); } + void ideal_size(int &w, int &h); + const char *type_name() { return "Fl_Check_Button"; } + const char *alt_type_name() { return "fltk::CheckButton"; } + Fl_Widget *widget(int x, int y, int w, int h); + Widget_Node *_make() { return new Check_Button_Node(); } + Type type() const { return FLD_NODE_TYPE_Check_Button; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Check_Button) ? true : super::is_a(inType); } }; // ---- Round Button ---- @@ -136,13 +136,13 @@ public: typedef Button_Node super; static Round_Button_Node prototype; public: - void ideal_size(int &w, int &h) override; - const char *type_name() override { return "Fl_Round_Button"; } - const char *alt_type_name() override { return "fltk::RadioButton"; } - Fl_Widget *widget(int x, int y, int w, int h) override; - Widget_Node *_make() override { return new Round_Button_Node(); } - Type type() const override { return FLD_NODE_TYPE_Round_Button; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Round_Button) ? true : super::is_a(inType); } + void ideal_size(int &w, int &h); + const char *type_name() { return "Fl_Round_Button"; } + const char *alt_type_name() { return "fltk::RadioButton"; } + Fl_Widget *widget(int x, int y, int w, int h); + Widget_Node *_make() { return new Round_Button_Node(); } + Type type() const { return FLD_NODE_TYPE_Round_Button; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Round_Button) ? true : super::is_a(inType); } }; diff --git a/fluid/nodes/Function_Node.h b/fluid/nodes/Function_Node.h index 87664e317..cc1444a26 100644 --- a/fluid/nodes/Function_Node.h +++ b/fluid/nodes/Function_Node.h @@ -59,20 +59,20 @@ public: Function_Node(); ~Function_Node(); - Node *make(Strategy strategy) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override; - void open() override; + Node *make(Strategy strategy); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f); + void open(); int ismain() {return name_ == 0;} - const char *type_name() override {return "Function";} - const char *title() override { return name() ? name() : "main()"; } - int can_have_children() const override {return 1;} - int is_code_block() const override {return 1;} - int is_public() const override; - Type type() const override { return FLD_NODE_TYPE_Function; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Function) ? 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; + const char *type_name() {return "Function";} + const char *title() { return name() ? name() : "main()"; } + int can_have_children() const {return 1;} + int is_code_block() const {return 1;} + int is_public() const; + Type type() const { return FLD_NODE_TYPE_Function; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Function) ? true : super::is_a(inType); } + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); int has_signature(const char *, const char*) const; const char *return_type() const { return return_type_ ? return_type_ : ""; } void return_type(const char *t) { storestring(t, return_type_); } @@ -98,18 +98,18 @@ private: public: Code_Node() = default; - ~Code_Node() override = default; - - Node *make(Strategy strategy) override; - void write(fld::io::Project_Writer &f) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override { } - void open() override; - const char *type_name() override {return "code";} - int is_code_block() const override {return 0;} - Type type() const override { return FLD_NODE_TYPE_Code; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Code) ? true : super::is_a(inType); } - int is_public() const override { return -1; } + ~Code_Node() = default; + + Node *make(Strategy strategy); + void write(fld::io::Project_Writer &f); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f) { } + void open(); + const char *type_name() {return "code";} + int is_code_block() const {return 0;} + Type type() const { return FLD_NODE_TYPE_Code; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Code) ? true : super::is_a(inType); } + int is_public() const { return -1; } int is_editing(); int reap_editor(); int handle_editor_changes(); @@ -136,18 +136,18 @@ public: CodeBlock_Node(); ~CodeBlock_Node(); - Node *make(Strategy strategy) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override; - void open() override; - const char *type_name() override {return "codeblock";} - int is_code_block() const override {return 1;} - int can_have_children() const override {return 1;} - int is_public() const override { return -1; } - Type type() const override { return FLD_NODE_TYPE_CodeBlock; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_CodeBlock) ? 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; + Node *make(Strategy strategy); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f); + void open(); + const char *type_name() {return "codeblock";} + int is_code_block() const {return 1;} + int can_have_children() const {return 1;} + int is_public() const { return -1; } + Type type() const { return FLD_NODE_TYPE_CodeBlock; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_CodeBlock) ? true : super::is_a(inType); } + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); const char *end_code() const { return end_code_ ? end_code_ : ""; } void end_code(const char *c) { storestring(c, end_code_); } }; @@ -166,18 +166,18 @@ protected: public: Decl_Node() = default; - ~Decl_Node() override = default; - - Node *make(Strategy strategy) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override { } - void open() override; - const char *type_name() override {return "decl";} - void write_properties(fld::io::Project_Writer &f) override; - void read_property(fld::io::Project_Reader &f, const char *) override; - int is_public() const override; - Type type() const override { return FLD_NODE_TYPE_Decl; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Decl) ? true : super::is_a(inType); } + ~Decl_Node() = default; + + Node *make(Strategy strategy); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f) { } + void open(); + const char *type_name() {return "decl";} + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + int is_public() const; + Type type() const { return FLD_NODE_TYPE_Decl; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Decl) ? true : super::is_a(inType); } char visibility() { return public_; } void visibility(char v) { public_ = v; } char output_file() { return (public_&1)|((static_&1)<<1); } @@ -200,15 +200,15 @@ public: Data_Node(); ~Data_Node(); - Node *make(Strategy strategy) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override {} - void open() override; - const char *type_name() override {return "data";} - void write_properties(fld::io::Project_Writer &f) override; - void read_property(fld::io::Project_Reader &f, const char *) override; - Type type() const override { return FLD_NODE_TYPE_Data; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Data) ? true : super::is_a(inType); } + Node *make(Strategy strategy); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f) {} + void open(); + const char *type_name() {return "data";} + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + Type type() const { return FLD_NODE_TYPE_Data; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Data) ? true : super::is_a(inType); } void filename(const char *fn) { storestring(fn, filename_); } const char *filename() const { return filename_ ? filename_ : ""; } int output_format() { return output_format_; } @@ -237,20 +237,20 @@ public: DeclBlock_Node(); ~DeclBlock_Node(); - Node *make(Strategy strategy) override; - void write_static(fld::io::Code_Writer& f) override; - void write_static_after(fld::io::Code_Writer& f) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override; - void open() override; - const char *type_name() override {return "declblock";} - void write_properties(fld::io::Project_Writer &f) override; - void read_property(fld::io::Project_Reader &f, const char *) override; - int can_have_children() const override {return 1;} - int is_decl_block() const override {return 1;} - int is_public() const override; - Type type() const override { return FLD_NODE_TYPE_DeclBlock; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_DeclBlock) ? true : super::is_a(inType); } + Node *make(Strategy strategy); + void write_static(fld::io::Code_Writer& f); + void write_static_after(fld::io::Code_Writer& f); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f); + void open(); + const char *type_name() {return "declblock";} + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + int can_have_children() const {return 1;} + int is_decl_block() const {return 1;} + int is_public() const; + Type type() const { return FLD_NODE_TYPE_DeclBlock; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_DeclBlock) ? true : super::is_a(inType); } const char *end_code() const { return end_code_ ? end_code_ : ""; } void end_code(const char *p) { storestring(p, end_code_); } int write_map() { return write_map_; } @@ -272,18 +272,18 @@ private: public: Comment_Node() = default; - ~Comment_Node() override = default; - - Node *make(Strategy strategy) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override { } - void open() override; - const char *type_name() override {return "comment";} - void write_properties(fld::io::Project_Writer &f) override; - void read_property(fld::io::Project_Reader &f, const char *) override; - int is_public() const override { return 1; } - Type type() const override { return FLD_NODE_TYPE_Comment; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Comment) ? true : super::is_a(inType); } + ~Comment_Node() = default; + + Node *make(Strategy strategy); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f) { } + void open(); + const char *type_name() {return "comment";} + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + int is_public() const { return 1; } + Type type() const { return FLD_NODE_TYPE_Comment; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Comment) ? true : super::is_a(inType); } bool in_h() { return in_h_; } void in_h(bool v) { in_h_ = v; } bool in_c() { return in_c_; } @@ -311,19 +311,19 @@ public: char write_public_state; // true when public: has been printed Class_Node* parent_class; // save class if nested - Node *make(Strategy strategy) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override; - void open() override; - const char *type_name() override {return "class";} - int can_have_children() const override {return 1;} - int is_decl_block() const override {return 1;} - int is_class() const override {return 1;} - int is_public() const override; - Type type() const override { return FLD_NODE_TYPE_Class; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Class) ? 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; + Node *make(Strategy strategy); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f); + void open(); + const char *type_name() {return "class";} + int can_have_children() const {return 1;} + int is_decl_block() const {return 1;} + int is_class() const {return 1;} + int is_public() const; + Type type() const { return FLD_NODE_TYPE_Class; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Class) ? true : super::is_a(inType); } + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); /** Get base class access and name. */ const char *base_class() const { return base_class_ ? base_class_ : ""; } diff --git a/fluid/nodes/Grid_Node.h b/fluid/nodes/Grid_Node.h index 706791d98..3caf77354 100644 --- a/fluid/nodes/Grid_Node.h +++ b/fluid/nodes/Grid_Node.h @@ -33,8 +33,8 @@ protected: public: Fl_Grid_Proxy(int X,int Y,int W,int H); ~Fl_Grid_Proxy(); - void resize(int,int,int,int) override; - void draw() override; + void resize(int,int,int,int); + void draw(); void draw_overlay(); void move_cell(Fl_Widget *child, int to_row, int to_col, int how = 0); Cell* any_cell(Fl_Widget *widget) const; @@ -51,26 +51,26 @@ public: static Grid_Node prototype; public: Grid_Node(); - const char *type_name() override {return "Fl_Grid";} - const char *alt_type_name() override {return "fltk::GridGroup";} - Widget_Node *_make() override { return new Grid_Node(); } - Fl_Widget *widget(int X,int Y,int W,int H) override; - Type type() const override { return FLD_NODE_TYPE_Grid; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Grid) ? 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; - void write_parent_properties(fld::io::Project_Writer &f, Node *child, bool encapsulate) override; - void read_parent_property(fld::io::Project_Reader &f, Node *child, const char *property) override; - Fl_Widget *enter_live_mode(int top=0) override; - void leave_live_mode() override; - void copy_properties() override; - void copy_properties_for_children() override; - 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; - void layout_widget() override; + const char *type_name() {return "Fl_Grid";} + const char *alt_type_name() {return "fltk::GridGroup";} + Widget_Node *_make() { return new Grid_Node(); } + Fl_Widget *widget(int X,int Y,int W,int H); + Type type() const { return FLD_NODE_TYPE_Grid; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Grid) ? true : super::is_a(inType); } + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + void write_parent_properties(fld::io::Project_Writer &f, Node *child, bool encapsulate); + void read_parent_property(fld::io::Project_Reader &f, Node *child, const char *property); + Fl_Widget *enter_live_mode(int top=0); + void leave_live_mode(); + void copy_properties(); + void copy_properties_for_children(); + 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*); + void layout_widget(); void child_resized(Widget_Node *child); void insert_child_at(Fl_Widget *child, int x, int y); void insert_child_at_next_free_cell(Fl_Widget *child); diff --git a/fluid/nodes/Group_Node.cxx b/fluid/nodes/Group_Node.cxx index eb735cbeb..8ff3b9cdf 100644 --- a/fluid/nodes/Group_Node.cxx +++ b/fluid/nodes/Group_Node.cxx @@ -632,7 +632,7 @@ class Fl_Table_Proxy : public Fl_Table { // Fl_Table calls this function to draw each visible cell in the table. // It's up to us to use FLTK's drawing functions to draw the cells the way we want. // - void draw_cell(TableContext context, int ROW=0, int COL=0, int X=0, int Y=0, int W=0, int H=0) override { + void draw_cell(TableContext context, int ROW=0, int COL=0, int X=0, int Y=0, int W=0, int H=0) { static char s[40]; switch ( context ) { case CONTEXT_STARTPAGE: // before page is drawn.. 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 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(); diff --git a/fluid/nodes/Tree.h b/fluid/nodes/Tree.h index f1a338630..b166c7f0b 100644 --- a/fluid/nodes/Tree.h +++ b/fluid/nodes/Tree.h @@ -89,7 +89,7 @@ public: bool empty() { return first == 0; } - // Iterators: `for (auto &n: tree.all_nodes()) { n.print(); } + // Iterators for traversing nodes and widgets Container all_nodes() { return Container(*this, false); } WContainer all_widgets() { return WContainer(*this, false); } Container all_selected_nodes() { return Container(*this, true); } diff --git a/fluid/nodes/Widget_Node.h b/fluid/nodes/Widget_Node.h index 98a943333..6259c079a 100644 --- a/fluid/nodes/Widget_Node.h +++ b/fluid/nodes/Widget_Node.h @@ -44,7 +44,7 @@ class Widget_Node : public Node virtual Fl_Widget* widget(int,int,int,int) = 0; virtual Widget_Node* _make() = 0; // virtual constructor - void setlabel(const char *) override; + void setlabel(const char *); /// Additional code blocks that can be inserted in the generated code char *extra_code_[NUM_EXTRA_CODE]; @@ -69,12 +69,12 @@ protected: /// disabling the output of the "hide" property by the Widget Type. uchar override_visible_; - void write_static(fld::io::Code_Writer& f) override; - void write_code1(fld::io::Code_Writer& f) override; + void write_static(fld::io::Code_Writer& f); + void write_code1(fld::io::Code_Writer& f); void write_widget_code(fld::io::Code_Writer& f); void write_extra_code(fld::io::Code_Writer& f); void write_block_close(fld::io::Code_Writer& f); - void write_code2(fld::io::Code_Writer& f) override; + void write_code2(fld::io::Code_Writer& f); void write_color(fld::io::Code_Writer& f, const char*, Fl_Color); /// Pointer to widget representing this node in live mode. @@ -118,8 +118,8 @@ public: Widget_Node(); ~Widget_Node(); - Node* make(Strategy strategy) override; - void open() override; + Node* make(Strategy strategy); + void open(); const char* extra_code(int n) const { return extra_code_[n] ? extra_code_[n] : ""; } void extra_code(int n, const char *code); @@ -139,20 +139,20 @@ public: virtual int textstuff(int what, Fl_Font &, int &, Fl_Color &); virtual Fl_Menu_Item* subtypes(); - Type type() const override { return FLD_NODE_TYPE_Widget_; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Widget_) ? true : super::is_a(inType); } - int is_widget() const override; - int is_true_widget() const override { return 1; } - int is_public() const override; + Type type() const { return FLD_NODE_TYPE_Widget_; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Widget_) ? true : super::is_a(inType); } + int is_widget() const; + int is_true_widget() const { return 1; } + int is_public() const; - void write_properties(fld::io::Project_Writer &f) override; - void read_property(fld::io::Project_Reader &f, const char *) override; - int read_fdesign(const char*, const char*) override; + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + int read_fdesign(const char*, const char*); - Fl_Widget* enter_live_mode(int top=0) override; + Fl_Widget* enter_live_mode(int top=0); Fl_Widget* propagate_live_mode(Fl_Group* grp); - void leave_live_mode() override; - void copy_properties() override; + void leave_live_mode(); + void copy_properties(); virtual void ideal_size(int &w, int &h); diff --git a/fluid/nodes/Window_Node.cxx b/fluid/nodes/Window_Node.cxx index 2bcd9f1b1..9a53d2ecb 100644 --- a/fluid/nodes/Window_Node.cxx +++ b/fluid/nodes/Window_Node.cxx @@ -125,17 +125,17 @@ static int overlays_invisible; // an overlay for the fluid ui, and special-cases the FL_NO_BOX. class Overlay_Window : public Fl_Overlay_Window { - void draw() override; - void draw_overlay() override; + void draw(); + void draw_overlay(); static void close_cb(Overlay_Window *self, void*); public: Window_Node *window; - int handle(int) override; + int handle(int); Overlay_Window(int W,int H) : Fl_Overlay_Window(W,H) { Fl_Group::current(0); callback((Fl_Callback*)close_cb); } - void resize(int,int,int,int) override; + void resize(int,int,int,int); uchar *read_image(int &ww, int &hh); }; diff --git a/fluid/nodes/Window_Node.h b/fluid/nodes/Window_Node.h index 6403dd78e..3c916576d 100644 --- a/fluid/nodes/Window_Node.h +++ b/fluid/nodes/Window_Node.h @@ -52,7 +52,7 @@ public: static Window_Node prototype; protected: - Fl_Menu_Item* subtypes() override {return window_type_menu;} + Fl_Menu_Item* subtypes() {return window_type_menu;} friend class Overlay_Window; int mx,my; // mouse position during dragging @@ -69,15 +69,15 @@ protected: void newdx(); void newposition(Widget_Node *,int &x,int &y,int &w,int &h); int handle(int); - void setlabel(const char *) override; - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override; - Widget_Node *_make() override {return 0;} // we don't call this - Fl_Widget *widget(int,int,int,int) override {return 0;} + void setlabel(const char *); + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f); + Widget_Node *_make() {return 0;} // we don't call this + Fl_Widget *widget(int,int,int,int) {return 0;} int recalc; // set by fix_overlay() void moveallchildren(int key=0); - Type type() const override { return FLD_NODE_TYPE_Window; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Window) ? true : super::is_a(inType); } + Type type() const { return FLD_NODE_TYPE_Window; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Window) ? true : super::is_a(inType); } void open_(); public: @@ -98,29 +98,29 @@ public: uchar modal, non_modal; const char *xclass; // junk string, used for shortcut - Node *make(Strategy strategy) override; - const char *type_name() override {return "Fl_Window";} - const char *alt_type_name() override {return "fltk::Window";} + Node *make(Strategy strategy); + const char *type_name() {return "Fl_Window";} + const char *alt_type_name() {return "fltk::Window";} - void open() override; - void ideal_size(int &w, int &h) override; + void open(); + void ideal_size(int &w, int &h); void fix_overlay(); // Update the bounding box, etc uchar *read_image(int &ww, int &hh); // Read an image of the window - void write_properties(fld::io::Project_Writer &f) override; - void read_property(fld::io::Project_Reader &f, const char *) override; - int read_fdesign(const char*, const char*) override; + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + int read_fdesign(const char*, const char*); - void add_child(Node*, Node*) override; - void move_child(Node*, Node*) override; - void remove_child(Node*) override; + void add_child(Node*, Node*); + void move_child(Node*, Node*); + void remove_child(Node*); - int can_have_children() const override {return 1;} + int can_have_children() const {return 1;} - Fl_Widget *enter_live_mode(int top=0) override; - void leave_live_mode() override; - void copy_properties() override; + Fl_Widget *enter_live_mode(int top=0); + void leave_live_mode(); + void copy_properties(); int sr_min_w, sr_min_h, sr_max_w, sr_max_h; @@ -134,7 +134,7 @@ public: static Widget_Class_Node prototype; protected: - Fl_Menu_Item* subtypes() override {return 0;} + Fl_Menu_Item* subtypes() {return 0;} public: Widget_Class_Node() { @@ -145,19 +145,19 @@ public: char write_public_state; // true when public: has been printed char wc_relative; // if 1, reposition all children, if 2, reposition and resize - void write_properties(fld::io::Project_Writer &f) override; - void read_property(fld::io::Project_Reader &f, const char *) override; - - void write_code1(fld::io::Code_Writer& f) override; - void write_code2(fld::io::Code_Writer& f) override; - Node *make(Strategy strategy) override; - const char *type_name() override {return "widget_class";} - Type type() const override { return FLD_NODE_TYPE_Widget_Class; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Widget_Class) ? true : super::is_a(inType); } - int can_have_children() const override {return 1;} - int is_code_block() const override {return 1;} - int is_decl_block() const override {return 1;} - int is_class() const override {return 1;} + void write_properties(fld::io::Project_Writer &f); + void read_property(fld::io::Project_Reader &f, const char *); + + void write_code1(fld::io::Code_Writer& f); + void write_code2(fld::io::Code_Writer& f); + Node *make(Strategy strategy); + const char *type_name() {return "widget_class";} + Type type() const { return FLD_NODE_TYPE_Widget_Class; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Widget_Class) ? true : super::is_a(inType); } + int can_have_children() const {return 1;} + int is_code_block() const {return 1;} + int is_decl_block() const {return 1;} + int is_class() const {return 1;} }; #endif // FLUID_NODES_WINDOW_NODE_H diff --git a/fluid/nodes/factory.cxx b/fluid/nodes/factory.cxx index 70e960edd..7e6726a41 100644 --- a/fluid/nodes/factory.cxx +++ b/fluid/nodes/factory.cxx @@ -106,8 +106,8 @@ public: typedef Widget_Node super; static Browser_Base_Node prototype; private: - Fl_Menu_Item *subtypes() override { return browser_base_type_menu; } - int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) override { + Fl_Menu_Item *subtypes() { return browser_base_type_menu; } + int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) { Fl_Browser_ *myo = (Fl_Browser_*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -119,20 +119,20 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { w = 120; h = 160; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Browser_"; } - const char *alt_type_name() override { return "fltk::Browser_"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Browser_"; } + const char *alt_type_name() { return "fltk::Browser_"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Browser* b = new Fl_Browser(x, y, w, h); return b; } - Widget_Node *_make() override { return new Browser_Base_Node(); } - Type type() const override { return FLD_NODE_TYPE_Browser_; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Browser_) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Browser_Base_Node(); } + Type type() const { return FLD_NODE_TYPE_Browser_; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Browser_) ? true : super::is_a(inType); } }; Browser_Base_Node Browser_Base_Node::prototype; @@ -150,9 +150,9 @@ public: typedef Browser_Base_Node super; static Browser_Node prototype; public: - const char *type_name() override { return "Fl_Browser"; } - const char *alt_type_name() override { return "fltk::Browser"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Browser"; } + const char *alt_type_name() { return "fltk::Browser"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Browser* b = new Fl_Browser(x, y, w, h); // Fl_Browser::add calls fl_height(), which requires the X display open. // Avoid this when compiling so it works w/o a display: @@ -165,9 +165,9 @@ public: } return b; } - Widget_Node *_make() override { return new Browser_Node(); } - Type type() const override { return FLD_NODE_TYPE_Browser; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Browser) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Browser_Node(); } + Type type() const { return FLD_NODE_TYPE_Browser; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Browser) ? true : super::is_a(inType); } }; Browser_Node Browser_Node::prototype; @@ -185,9 +185,9 @@ public: typedef Browser_Base_Node super; static Check_Browser_Node prototype; public: - const char *type_name() override { return "Fl_Check_Browser"; } - const char *alt_type_name() override { return "fltk::CheckBrowser"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Check_Browser"; } + const char *alt_type_name() { return "fltk::CheckBrowser"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Check_Browser* b = new Fl_Check_Browser(x, y, w, h); // Fl_Check_Browser::add calls fl_height(), which requires the X display open. // Avoid this when compiling so it works w/o a display: @@ -200,9 +200,9 @@ public: } return b; } - Widget_Node *_make() override { return new Check_Browser_Node(); } - Type type() const override { return FLD_NODE_TYPE_Check_Browser; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Check_Browser) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Check_Browser_Node(); } + Type type() const { return FLD_NODE_TYPE_Check_Browser; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Check_Browser) ? true : super::is_a(inType); } }; Check_Browser_Node Check_Browser_Node::prototype; @@ -221,16 +221,16 @@ public: typedef Browser_Node super; static File_Browser_Node prototype; public: - const char *type_name() override { return "Fl_File_Browser"; } - const char *alt_type_name() override { return "fltk::FileBrowser"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_File_Browser"; } + const char *alt_type_name() { return "fltk::FileBrowser"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_File_Browser* b = new Fl_File_Browser(x, y, w, h); if (!Fluid.batch_mode) b->load("."); return b; } - Widget_Node *_make() override { return new File_Browser_Node(); } - Type type() const override { return FLD_NODE_TYPE_File_Browser; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_File_Browser) ? true : super::is_a(inType); } + Widget_Node *_make() { return new File_Browser_Node(); } + Type type() const { return FLD_NODE_TYPE_File_Browser; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_File_Browser) ? true : super::is_a(inType); } }; File_Browser_Node File_Browser_Node::prototype; @@ -252,14 +252,14 @@ public: typedef Widget_Node super; static Tree_Node prototype; public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { w = 120; h = 160; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Tree"; } - const char *alt_type_name() override { return "fltk::TreeBrowser"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Tree"; } + const char *alt_type_name() { return "fltk::TreeBrowser"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Tree* b = new Fl_Tree(x, y, w, h); if (!Fluid.batch_mode) { b->add("/A1/B1/C1"); @@ -273,9 +273,9 @@ public: } return b; } - Widget_Node *_make() override { return new Tree_Node(); } - Type type() const override { return FLD_NODE_TYPE_Tree; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Tree) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Tree_Node(); } + Type type() const { return FLD_NODE_TYPE_Tree; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Tree) ? true : super::is_a(inType); } }; Tree_Node Tree_Node::prototype; @@ -295,7 +295,7 @@ public: typedef Widget_Node super; static Help_View_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_Help_View *myo = (Fl_Help_View*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -307,14 +307,14 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { w = 160; h = 120; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Help_View"; } - const char *alt_type_name() override { return "fltk::HelpView"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Help_View"; } + const char *alt_type_name() { return "fltk::HelpView"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Help_View *myo = new Fl_Help_View(x, y, w, h); if (!Fluid.batch_mode) { myo->value("<HTML><BODY><H1>Fl_Help_View Widget</H1>" @@ -322,9 +322,9 @@ public: } return myo; } - Widget_Node *_make() override { return new Help_View_Node(); } - Type type() const override { return FLD_NODE_TYPE_Help_View; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Help_View) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Help_View_Node(); } + Type type() const { return FLD_NODE_TYPE_Help_View; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Help_View) ? true : super::is_a(inType); } }; Help_View_Node Help_View_Node::prototype; @@ -345,14 +345,14 @@ public: typedef Widget_Node super; static Valuator_Node prototype; public: - const char *type_name() override { return "Fl_Valuator"; } - const char *alt_type_name() override { return "fltk::Valuator"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Valuator"; } + const char *alt_type_name() { return "fltk::Valuator"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Slider(x, y, w, h, "Valuator"); } - Widget_Node *_make() override { return new Valuator_Node(); } - Type type() const override { return FLD_NODE_TYPE_Valuator_; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Valuator_) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Valuator_Node(); } + Type type() const { return FLD_NODE_TYPE_Valuator_; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Valuator_) ? true : super::is_a(inType); } }; Valuator_Node Valuator_Node::prototype; @@ -376,8 +376,8 @@ public: typedef Valuator_Node super; static Counter_Node prototype; private: - Fl_Menu_Item *subtypes() override { return counter_type_menu; } - int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) override { + Fl_Menu_Item *subtypes() { return counter_type_menu; } + int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) { Fl_Counter *myo = (Fl_Counter*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -389,20 +389,20 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + 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() * 4 + 4 * h; // make room for the arrows fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Counter"; } - const char *alt_type_name() override { return "fltk::Counter"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Counter"; } + const char *alt_type_name() { return "fltk::Counter"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Counter(x, y, w, h, "counter:"); } - Widget_Node *_make() override { return new Counter_Node(); } - Type type() const override { return FLD_NODE_TYPE_Counter; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Counter) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Counter_Node(); } + Type type() const { return FLD_NODE_TYPE_Counter; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Counter) ? true : super::is_a(inType); } }; Counter_Node Counter_Node::prototype; @@ -419,20 +419,20 @@ public: typedef Valuator_Node super; static Adjuster_Node prototype; public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->labelsize + 8; w = 3 * h; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Adjuster"; } - const char *alt_type_name() override { return "fltk::Adjuster"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Adjuster"; } + const char *alt_type_name() { return "fltk::Adjuster"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Adjuster(x, y, w, h); } - Widget_Node *_make() override { return new Adjuster_Node(); } - Type type() const override { return FLD_NODE_TYPE_Adjuster; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Adjuster) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Adjuster_Node(); } + Type type() const { return FLD_NODE_TYPE_Adjuster; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Adjuster) ? true : super::is_a(inType); } }; Adjuster_Node Adjuster_Node::prototype; @@ -456,20 +456,20 @@ public: typedef Valuator_Node super; static Dial_Node prototype; private: - Fl_Menu_Item *subtypes() override { return dial_type_menu; } + Fl_Menu_Item *subtypes() { return dial_type_menu; } public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { w = 60; h = 60; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Dial"; } - const char *alt_type_name() override { return "fltk::Dial"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Dial"; } + const char *alt_type_name() { return "fltk::Dial"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Dial(x, y, w, h); } - Widget_Node *_make() override { return new Dial_Node(); } - Type type() const override { return FLD_NODE_TYPE_Dial; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Dial) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Dial_Node(); } + Type type() const { return FLD_NODE_TYPE_Dial; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Dial) ? true : super::is_a(inType); } }; Dial_Node Dial_Node::prototype; @@ -492,22 +492,22 @@ public: typedef Valuator_Node super; static Roller_Node prototype; private: - Fl_Menu_Item *subtypes() override { return roller_type_menu; } + Fl_Menu_Item *subtypes() { return roller_type_menu; } public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { fld::app::Layout_Preset *layout = Fluid.proj.layout; w = layout->labelsize + 8; h = 4 * w; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Roller"; } - const char *alt_type_name() override { return "fltk::Roller"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Roller"; } + const char *alt_type_name() { return "fltk::Roller"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Roller(x, y, w, h); } - Widget_Node *_make() override { return new Roller_Node(); } - Type type() const override { return FLD_NODE_TYPE_Roller; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Roller) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Roller_Node(); } + Type type() const { return FLD_NODE_TYPE_Roller; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Roller) ? true : super::is_a(inType); } }; Roller_Node Roller_Node::prototype; @@ -536,22 +536,22 @@ public: typedef Valuator_Node super; static Slider_Node prototype; private: - Fl_Menu_Item *subtypes() override { return slider_type_menu; } + Fl_Menu_Item *subtypes() { return slider_type_menu; } public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { fld::app::Layout_Preset *layout = Fluid.proj.layout; w = layout->labelsize + 8; h = 4 * w; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Slider"; } - const char *alt_type_name() override { return "fltk::Slider"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Slider"; } + const char *alt_type_name() { return "fltk::Slider"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Slider(x, y, w, h, "slider:"); } - Widget_Node *_make() override { return new Slider_Node(); } - Type type() const override { return FLD_NODE_TYPE_Slider; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Slider) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Slider_Node(); } + Type type() const { return FLD_NODE_TYPE_Slider; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Slider) ? true : super::is_a(inType); } }; Slider_Node Slider_Node::prototype; @@ -574,16 +574,16 @@ public: typedef Slider_Node super; static Scrollbar_Node prototype; private: - Fl_Menu_Item *subtypes() override { return scrollbar_type_menu; } + Fl_Menu_Item *subtypes() { return scrollbar_type_menu; } public: - const char *type_name() override { return "Fl_Scrollbar"; } - const char *alt_type_name() override { return "fltk::Scrollbar"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Scrollbar"; } + const char *alt_type_name() { return "fltk::Scrollbar"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Scrollbar(x, y, w, h); } - Widget_Node *_make() override { return new Scrollbar_Node(); } - Type type() const override { return FLD_NODE_TYPE_Scrollbar; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Scrollbar) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Scrollbar_Node(); } + Type type() const { return FLD_NODE_TYPE_Scrollbar; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Scrollbar) ? true : super::is_a(inType); } }; Scrollbar_Node Scrollbar_Node::prototype; @@ -600,7 +600,7 @@ public: typedef Slider_Node super; static Value_Slider_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_Value_Slider *myo = (Fl_Value_Slider*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -612,14 +612,14 @@ private: return 1; } public: - const char *type_name() override { return "Fl_Value_Slider"; } - const char *alt_type_name() override { return "fltk::ValueSlider"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Value_Slider"; } + const char *alt_type_name() { return "fltk::ValueSlider"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Value_Slider(x, y, w, h, "slider:"); } - Widget_Node *_make() override { return new Value_Slider_Node(); } - Type type() const override { return FLD_NODE_TYPE_Value_Slider; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Value_Slider) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Value_Slider_Node(); } + Type type() const { return FLD_NODE_TYPE_Value_Slider; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Value_Slider) ? true : super::is_a(inType); } }; Value_Slider_Node Value_Slider_Node::prototype; @@ -636,7 +636,7 @@ public: typedef Valuator_Node super; static Value_Input_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_Value_Input *myo = (Fl_Value_Input*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -648,21 +648,21 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + 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() * 4 + 8; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Value_Input"; } - const char *alt_type_name() override { return "fltk::ValueInput"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Value_Input"; } + const char *alt_type_name() { return "fltk::ValueInput"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Value_Input *myo = new Fl_Value_Input(x, y, w, h, "value:"); return myo; } - Widget_Node *_make() override { return new Value_Input_Node(); } - Type type() const override { return FLD_NODE_TYPE_Value_Input; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Value_Input) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Value_Input_Node(); } + Type type() const { return FLD_NODE_TYPE_Value_Input; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Value_Input) ? true : super::is_a(inType); } }; Value_Input_Node Value_Input_Node::prototype; @@ -679,7 +679,7 @@ public: typedef Valuator_Node super; static Value_Output_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_Value_Output *myo = (Fl_Value_Output*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -691,21 +691,21 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + 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() * 4 + 8; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Value_Output"; } - const char *alt_type_name() override { return "fltk::ValueOutput"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Value_Output"; } + const char *alt_type_name() { return "fltk::ValueOutput"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Value_Output *myo = new Fl_Value_Output(x, y, w, h, "value:"); return myo; } - Widget_Node *_make() override { return new Value_Output_Node(); } - Type type() const override { return FLD_NODE_TYPE_Value_Output; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Value_Output) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Value_Output_Node(); } + Type type() const { return FLD_NODE_TYPE_Value_Output; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Value_Output) ? true : super::is_a(inType); } }; Value_Output_Node Value_Output_Node::prototype; @@ -737,8 +737,8 @@ public: typedef Widget_Node super; static Input_Node prototype; private: - Fl_Menu_Item *subtypes() override { return input_type_menu; } - int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) override { + Fl_Menu_Item *subtypes() { return input_type_menu; } + int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) { Fl_Input_ *myo = (Fl_Input_*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -750,23 +750,23 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + 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); } - const char *type_name() override { return "Fl_Input"; } - const char *alt_type_name() override { return "fltk::Input"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Input"; } + const char *alt_type_name() { return "fltk::Input"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Input *myo = new Fl_Input(x, y, w, h, "input:"); myo->value("Text Input"); return myo; } - Widget_Node *_make() override { return new Input_Node(); } - Type type() const override { return FLD_NODE_TYPE_Input; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Input) ? true : super::is_a(inType); } - void copy_properties() override { + Widget_Node *_make() { return new Input_Node(); } + Type type() const { return FLD_NODE_TYPE_Input; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Input) ? true : super::is_a(inType); } + void copy_properties() { Widget_Node::copy_properties(); Fl_Input_ *d = (Fl_Input_*)live_widget, *s = (Fl_Input_*)o; d->textfont(s->textfont()); @@ -790,24 +790,24 @@ public: typedef Input_Node super; static File_Input_Node prototype; private: - Fl_Menu_Item *subtypes() override { return 0; } // Don't inherit. + Fl_Menu_Item *subtypes() { return 0; } // Don't inherit. public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() + 8 + 10; // Directoy bar is additional 10 pixels high w = layout->textsize_not_null() * 10 + 8; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_File_Input"; } - const char *alt_type_name() override { return "fltk::FileInput"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_File_Input"; } + const char *alt_type_name() { return "fltk::FileInput"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_File_Input *myo = new Fl_File_Input(x, y, w, h, "file:"); myo->value("/usr/include/FL/Fl.H"); return myo; } - Widget_Node *_make() override { return new File_Input_Node(); } - Type type() const override { return FLD_NODE_TYPE_File_Input; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_File_Input) ? true : super::is_a(inType); } + Widget_Node *_make() { return new File_Input_Node(); } + Type type() const { return FLD_NODE_TYPE_File_Input; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_File_Input) ? true : super::is_a(inType); } }; File_Input_Node File_Input_Node::prototype; @@ -830,18 +830,18 @@ public: typedef Input_Node super; static Output_Node prototype; private: - Fl_Menu_Item *subtypes() override { return output_type_menu; } + Fl_Menu_Item *subtypes() { return output_type_menu; } public: - const char *type_name() override { return "Fl_Output"; } - const char *alt_type_name() override { return "fltk::Output"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Output"; } + const char *alt_type_name() { return "fltk::Output"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Output *myo = new Fl_Output(x, y, w, h, "output:"); myo->value("Text Output"); return myo; } - Widget_Node *_make() override { return new Output_Node(); } - Type type() const override { return FLD_NODE_TYPE_Output; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Output) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Output_Node(); } + Type type() const { return FLD_NODE_TYPE_Output; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Output) ? true : super::is_a(inType); } }; Output_Node Output_Node::prototype; @@ -864,7 +864,7 @@ public: typedef Widget_Node super; static Text_Display_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_Text_Display *myo = (Fl_Text_Display*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -876,15 +876,15 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() * 4 + 8; w = layout->textsize_not_null() * 10 + 8; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Text_Display"; } - const char *alt_type_name() override { return "fltk::TextDisplay"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Text_Display"; } + const char *alt_type_name() { return "fltk::TextDisplay"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Text_Display *myo = new Fl_Text_Display(x, y, w, h); if (!Fluid.batch_mode) { Fl_Text_Buffer *b = new Fl_Text_Buffer(); @@ -893,9 +893,9 @@ public: } return myo; } - Widget_Node *_make() override { return new Text_Display_Node(); } - Type type() const override { return FLD_NODE_TYPE_Text_Display; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Text_Display) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Text_Display_Node(); } + Type type() const { return FLD_NODE_TYPE_Text_Display; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Text_Display) ? true : super::is_a(inType); } }; Text_Display_Node Text_Display_Node::prototype; @@ -912,9 +912,9 @@ public: typedef Text_Display_Node super; static Text_Editor_Node prototype; public: - const char *type_name() override {return "Fl_Text_Editor";} - const char *alt_type_name() override {return "fltk::TextEditor";} - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() {return "Fl_Text_Editor";} + const char *alt_type_name() {return "fltk::TextEditor";} + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Text_Editor *myo = new Fl_Text_Editor(x, y, w, h); if (!Fluid.batch_mode) { Fl_Text_Buffer *b = new Fl_Text_Buffer(); @@ -923,9 +923,9 @@ public: } return myo; } - Widget_Node *_make() override { return new Text_Editor_Node(); } - Type type() const override { return FLD_NODE_TYPE_Text_Editor; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Text_Editor) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Text_Editor_Node(); } + Type type() const { return FLD_NODE_TYPE_Text_Editor; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Text_Editor) ? true : super::is_a(inType); } }; Text_Editor_Node Text_Editor_Node::prototype; @@ -942,7 +942,7 @@ public: clear_screen_home(false); append("> ls -als"); } - void resize(int x, int y, int w, int h) override { + void resize(int x, int y, int w, int h) { Fl_Terminal::resize(x, y, w, h); // After a resize, the top text vanishes, so make sure we redraw it. print_sample_text(); @@ -983,10 +983,10 @@ public: typedef Widget_Node super; static Terminal_Node prototype; public: - const char *type_name() override { return "Fl_Terminal"; } + const char *type_name() { return "Fl_Terminal"; } // Older .fl files with Fl_Simple_Terminal will create a Fl_Terminal instead. - const char *alt_type_name() override { return "Fl_Simple_Terminal"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *alt_type_name() { return "Fl_Simple_Terminal"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Widget *ret = 0; if (Fluid.batch_mode) { ret = new Fl_Batchmode_Terminal(x, y, w, h); @@ -996,7 +996,7 @@ public: } return ret; } - 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) { if (Fluid.batch_mode) { Fl_Batchmode_Terminal *myo = (Fl_Batchmode_Terminal*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { @@ -1018,9 +1018,9 @@ public: } return 1; } - Widget_Node *_make() override {return new Terminal_Node();} - Type type() const override { return FLD_NODE_TYPE_Terminal; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Terminal) ? true : super::is_a(inType); } + Widget_Node *_make() {return new Terminal_Node();} + Type type() const { return FLD_NODE_TYPE_Terminal; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Terminal) ? true : super::is_a(inType); } }; Terminal_Node Terminal_Node::prototype; @@ -1041,18 +1041,18 @@ public: typedef Widget_Node super; static Box_Node prototype; public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { w = 100; h = 100; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Box"; } - const char *alt_type_name() override { return "fltk::Widget"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Box"; } + const char *alt_type_name() { return "fltk::Widget"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Box(x, y, w, h, "label"); } - Widget_Node *_make() override { return new Box_Node(); } - Type type() const override { return FLD_NODE_TYPE_Box; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Box) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Box_Node(); } + Type type() const { return FLD_NODE_TYPE_Box; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Box) ? true : super::is_a(inType); } }; Box_Node Box_Node::prototype; @@ -1070,18 +1070,18 @@ public: typedef Widget_Node super; static Clock_Node prototype; public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { w = 80; h = 80; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Clock"; } - const char *alt_type_name() override { return "fltk::Clock"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Clock"; } + const char *alt_type_name() { return "fltk::Clock"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Clock(x, y, w, h); } - Widget_Node *_make() override { return new Clock_Node(); } - Type type() const override { return FLD_NODE_TYPE_Clock; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Clock) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Clock_Node(); } + Type type() const { return FLD_NODE_TYPE_Clock; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Clock) ? true : super::is_a(inType); } }; Clock_Node Clock_Node::prototype; @@ -1100,22 +1100,22 @@ public: typedef Widget_Node super; static Progress_Node prototype; public: - void ideal_size(int &w, int &h) override { + void ideal_size(int &w, int &h) { fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->labelsize + 8; w = layout->labelsize * 12; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Progress"; } - const char *alt_type_name() override { return "fltk::ProgressBar"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Progress"; } + const char *alt_type_name() { return "fltk::ProgressBar"; } + Fl_Widget *widget(int x, int y, int w, int h) { Fl_Progress *myo = new Fl_Progress(x, y, w, h, "label"); myo->value(50); return myo; } - Widget_Node *_make() override { return new Progress_Node(); } - Type type() const override { return FLD_NODE_TYPE_Progress; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Progress) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Progress_Node(); } + Type type() const { return FLD_NODE_TYPE_Progress; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Progress) ? true : super::is_a(inType); } }; Progress_Node Progress_Node::prototype; @@ -1139,8 +1139,8 @@ public: typedef Widget_Node super; static Spinner_Node prototype; private: - Fl_Menu_Item *subtypes() override { return spinner_type_menu; } - int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) override { + Fl_Menu_Item *subtypes() { return spinner_type_menu; } + int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) { Fl_Spinner *myo = (Fl_Spinner*)(w==4 ? ((Widget_Node*)factory)->o : o); switch (w) { case 4: @@ -1152,20 +1152,20 @@ private: return 1; } public: - void ideal_size(int &w, int &h) override { + 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() * 4 + 8; fld::app::Snap_Action::better_size(w, h); } - const char *type_name() override { return "Fl_Spinner"; } - const char *alt_type_name() override { return "fltk::Spinner"; } - Fl_Widget *widget(int x, int y, int w, int h) override { + const char *type_name() { return "Fl_Spinner"; } + const char *alt_type_name() { return "fltk::Spinner"; } + Fl_Widget *widget(int x, int y, int w, int h) { return new Fl_Spinner(x, y, w, h, "spinner:"); } - Widget_Node *_make() override { return new Spinner_Node(); } - Type type() const override { return FLD_NODE_TYPE_Spinner; } - bool is_a(Type inType) const override { return (inType==FLD_NODE_TYPE_Spinner) ? true : super::is_a(inType); } + Widget_Node *_make() { return new Spinner_Node(); } + Type type() const { return FLD_NODE_TYPE_Spinner; } + bool is_a(Type inType) const { return (inType==FLD_NODE_TYPE_Spinner) ? true : super::is_a(inType); } }; Spinner_Node Spinner_Node::prototype; |