diff options
Diffstat (limited to 'fluid/nodes/Group_Node.cxx')
| -rw-r--r-- | fluid/nodes/Group_Node.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fluid/nodes/Group_Node.cxx b/fluid/nodes/Group_Node.cxx index 7565a5552..088e999aa 100644 --- a/fluid/nodes/Group_Node.cxx +++ b/fluid/nodes/Group_Node.cxx @@ -73,7 +73,7 @@ void Fl_Group_Proxy::draw() { \brief Enlarge the group size, so all children fit within. */ void fix_group_size(Node *tt) { - if (!tt || !tt->is_a(Type::Group)) return; + if (!tt || !tt->is_a(FLD_NODE_TYPE_Group)) return; Group_Node* t = (Group_Node*)tt; int X = t->o->x(); int Y = t->o->y(); @@ -102,14 +102,14 @@ void group_cb(Fl_Widget *, void *) { fl_message("Only widgets and menu items can be grouped."); return; } - if (Fluid.proj.tree.current->is_a(Type::Menu_Item)) { + if (Fluid.proj.tree.current->is_a(FLD_NODE_TYPE_Menu_Item)) { group_selected_menuitems(); return; } // The group will be created in the parent group of the current widget Node *qq = Fluid.proj.tree.current->parent; Widget_Node *q = static_cast<Widget_Node*>(Fluid.proj.tree.current); - while (qq && !qq->is_a(Type::Group)) { + while (qq && !qq->is_a(FLD_NODE_TYPE_Group)) { qq = qq->parent; } if (!qq) { @@ -150,7 +150,7 @@ void ungroup_cb(Fl_Widget *, void *) { fl_message("Only widgets and menu items can be ungrouped."); return; } - if (Fluid.proj.tree.current->is_a(Type::Menu_Item)) { + if (Fluid.proj.tree.current->is_a(FLD_NODE_TYPE_Menu_Item)) { ungroup_selected_menuitems(); return; } @@ -159,7 +159,7 @@ void ungroup_cb(Fl_Widget *, void *) { int q_level = q->level; Node *qq = Fluid.proj.tree.current->parent; while (qq && !qq->is_true_widget()) qq = qq->parent; - if (!qq || !qq->is_a(Type::Group)) { + if (!qq || !qq->is_a(FLD_NODE_TYPE_Group)) { fl_message("Only menu widgets inside a group can be ungrouped."); return; } @@ -510,7 +510,7 @@ void Flex_Node::change_subtype_to(int n) { int Flex_Node::parent_is_flex(Node *t) { return (t->is_widget() && t->parent - && t->parent->is_a(Type::Flex)); + && t->parent->is_a(FLD_NODE_TYPE_Flex)); } /** @@ -576,7 +576,7 @@ void Flex_Node::keyboard_move_child(Widget_Node *child, int key) { int Flex_Node::size(Node *t, char fixed_only) { if (!t->is_widget()) return 0; if (!t->parent) return 0; - if (!t->parent->is_a(Type::Flex)) return 0; + if (!t->parent->is_a(FLD_NODE_TYPE_Flex)) return 0; Flex_Node* ft = (Flex_Node*)t->parent; Fl_Flex* f = (Fl_Flex*)ft->o; Fl_Widget *w = ((Widget_Node*)t)->o; @@ -587,7 +587,7 @@ int Flex_Node::size(Node *t, char fixed_only) { int Flex_Node::is_fixed(Node *t) { if (!t->is_widget()) return 0; if (!t->parent) return 0; - if (!t->parent->is_a(Type::Flex)) return 0; + if (!t->parent->is_a(FLD_NODE_TYPE_Flex)) return 0; Flex_Node* ft = (Flex_Node*)t->parent; Fl_Flex* f = (Fl_Flex*)ft->o; Fl_Widget *w = ((Widget_Node*)t)->o; |