diff options
Diffstat (limited to 'fluid/nodes/factory.cxx')
| -rw-r--r-- | fluid/nodes/factory.cxx | 390 |
1 files changed, 195 insertions, 195 deletions
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; |
