diff options
Diffstat (limited to 'fluid/nodes/Menu_Node.h')
| -rw-r--r-- | fluid/nodes/Menu_Node.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fluid/nodes/Menu_Node.h b/fluid/nodes/Menu_Node.h index b0e46afca..66232cbef 100644 --- a/fluid/nodes/Menu_Node.h +++ b/fluid/nodes/Menu_Node.h @@ -60,12 +60,12 @@ public: 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); + virtual const char* menu_name(Code_Writer& f, int& i); int flags(); - void write_static(fld::io::Code_Writer& f); - void write_item(fld::io::Code_Writer& f); - void write_code1(fld::io::Code_Writer& f); - void write_code2(fld::io::Code_Writer& f); + void write_static(Code_Writer& f); + void write_item(Code_Writer& f); + void write_code1(Code_Writer& f); + void write_code2(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); } @@ -141,10 +141,10 @@ class Menu_Manager_Node : public Widget_Node typedef Widget_Node super; public: void ideal_size(int &w, int &h) { - fld::app::Layout_Preset *layout = Fluid.proj.layout; + 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); + Snap_Action::better_size(w, h); } int can_have_children() const {return 1;} int menusize; @@ -154,7 +154,7 @@ public: 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 write_code2(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); } @@ -294,9 +294,9 @@ public: 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); + void write_static(Code_Writer& f); + void write_code1(Code_Writer& f); +// void write_code2(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(); |