diff options
Diffstat (limited to 'fluid/nodes/Group_Node.h')
| -rw-r--r-- | fluid/nodes/Group_Node.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fluid/nodes/Group_Node.h b/fluid/nodes/Group_Node.h index 52f31a907..71df8aa46 100644 --- a/fluid/nodes/Group_Node.h +++ b/fluid/nodes/Group_Node.h @@ -39,7 +39,7 @@ 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(nullptr); } + 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; }; @@ -54,7 +54,7 @@ public: 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 { - Fl_Group_Proxy *g = new Fl_Group_Proxy(X,Y,W,H); Fl_Group::current(nullptr); return g;} + 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; @@ -98,7 +98,7 @@ 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(nullptr); } + 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; }; @@ -114,12 +114,12 @@ private: int *fixedSizeTuple; /* [ index, size, index2, size2, ... ] */ int suspend_auto_layout; public: - Flex_Node() : fixedSizeTupleSize(0), fixedSizeTuple(nullptr), suspend_auto_layout(0) { } + 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 { - Fl_Flex *g = new Fl_Flex_Proxy(X,Y,W,H); Fl_Group::current(nullptr); return g;} + 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; @@ -182,7 +182,7 @@ 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 { - Fl_Tabs_Proxy *g = new Fl_Tabs_Proxy(X,Y,W,H); Fl_Group::current(nullptr); return g;} + 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; @@ -254,7 +254,7 @@ 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 { - Fl_Wizard_Proxy *g = new Fl_Wizard_Proxy(X,Y,W,H); Fl_Group::current(nullptr); return g;} + 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); } |