mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FLUID: restores g++98 compatibility

Browse Source 
I want enum classes, sigh.
This commit is contained in:
Matthias Melcher 2023-07-17 20:40:55 +02:00
parent 9bdc7139da
commit 2279f85824
18 changed files with 292 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fluid/Fl_Function_Type.cxx
View File

@ -45,7 +45,7 @@ Fl_Class_Type *current_class = NULL;
int has_toplevel_function(const char *rtype, const char *sig) {
Fl_Type *child;
for (child = Fl_Type::first; child; child = child->next) {
if (!child->is_in_class() && (child->id() == Fl_Type::ID::Function)) {
if (!child->is_in_class() && (child->id() == Fl_Type::ID_Function)) {
const Fl_Function_Type *fn = (const Fl_Function_Type*)child;
if (fn->has_signature(rtype, sig))
return 1;
@ -1982,7 +1982,7 @@ void Fl_Class_Type::write_code2(Fd_Code_Writer& f) {
int Fl_Class_Type::has_function(const char *rtype, const char *sig) const {
Fl_Type *child;
for (child = next; child && child->level > level; child = child->next) {
if (child->level == level+1 && (child->id() == Fl_Type::ID::Function)) {
if (child->level == level+1 && (child->id() == Fl_Type::ID_Function)) {
const Fl_Function_Type *fn = (const Fl_Function_Type*)child;
if (fn->has_signature(rtype, sig))
return 1;

16
fluid/Fl_Function_Type.h
View File

@ -61,7 +61,7 @@ public:
int is_parent() const FL_OVERRIDE {return 1;}
int is_code_block() const FL_OVERRIDE {return 1;}
int is_public() const FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Function; }
ID id() const FL_OVERRIDE { return ID_Function; }
void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
void read_property(Fd_Project_Reader &f, const char *) FL_OVERRIDE;
int has_signature(const char *, const char*) const;
@ -85,7 +85,7 @@ public:
const char *type_name() FL_OVERRIDE {return "code";}
int is_code_block() const FL_OVERRIDE {return 0;}
int is_code() const FL_OVERRIDE {return 1;}
ID id() const FL_OVERRIDE { return ID::Code; }
ID id() const FL_OVERRIDE { return ID_Code; }
int is_public() const FL_OVERRIDE { return -1; }
int is_editing();
int reap_editor();
@ -108,7 +108,7 @@ public:
int is_code_block() const FL_OVERRIDE {return 1;}
int is_parent() const FL_OVERRIDE {return 1;}
int is_public() const FL_OVERRIDE { return -1; }
ID id() const FL_OVERRIDE { return ID::CodeBlock; }
ID id() const FL_OVERRIDE { return ID_CodeBlock; }
void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
void read_property(Fd_Project_Reader &f, const char *) FL_OVERRIDE;
};
@ -131,7 +131,7 @@ public:
void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
void read_property(Fd_Project_Reader &f, const char *) FL_OVERRIDE;
int is_public() const FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Decl; }
ID id() const FL_OVERRIDE { return ID_Decl; }
};
// ---- Fl_Data_Type declaration
@ -150,7 +150,7 @@ public:
const char *type_name() FL_OVERRIDE {return "data";}
void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
void read_property(Fd_Project_Reader &f, const char *) FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Data; }
ID id() const FL_OVERRIDE { return ID_Data; }
};
// ---- Fl_DeclBlock_Type declaration
@ -172,7 +172,7 @@ public:
int is_parent() const FL_OVERRIDE {return 1;}
int is_decl_block() const FL_OVERRIDE {return 1;}
int is_public() const FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::DeclBlock; }
ID id() const FL_OVERRIDE { return ID_DeclBlock; }
};
// ---- Fl_Comment_Type declaration
@ -193,7 +193,7 @@ public:
void read_property(Fd_Project_Reader &f, const char *) FL_OVERRIDE;
int is_public() const FL_OVERRIDE { return 1; }
int is_comment() const FL_OVERRIDE { return 1; }
ID id() const FL_OVERRIDE { return ID::Comment; }
ID id() const FL_OVERRIDE { return ID_Comment; }
};
// ---- Fl_Class_Type declaration
@ -219,7 +219,7 @@ public:
int is_decl_block() const FL_OVERRIDE {return 1;}
int is_class() const FL_OVERRIDE {return 1;}
int is_public() const FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Class; }
ID id() const FL_OVERRIDE { return ID_Class; }
void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
void read_property(Fd_Project_Reader &f, const char *) FL_OVERRIDE;

4
fluid/Fl_Group_Type.cxx
View File

@ -78,7 +78,7 @@ void group_cb(Fl_Widget *, void *) {
// Find the current widget:
Fl_Type *qq = Fl_Type::current;
while (qq && (!qq->is_widget() || qq->is_menu_item())) qq = qq->parent;
if (!qq || qq->level < 1 || (qq->level == 1 && (qq->id() == Fl_Type::ID::Widget_Class))) {
if (!qq || qq->level < 1 || (qq->level == 1 && (qq->id() == Fl_Type::ID_Widget_Class))) {
fl_message("Please select widgets to group");
return;
}
@ -107,7 +107,7 @@ void ungroup_cb(Fl_Widget *, void *) {
Fl_Type *q = Fl_Type::current;
while (q && (!q->is_widget() || q->is_menu_item())) q = q->parent;
if (q) q = q->parent;
if (!q || q->level < 1 || (q->level == 1 && (q->id() == Fl_Type::ID::Widget_Class))) {
if (!q || q->level < 1 || (q->level == 1 && (q->id() == Fl_Type::ID_Widget_Class))) {
fl_message("Please select widgets in a group");
return;
}

16
fluid/Fl_Group_Type.h
View File

@ -51,7 +51,7 @@ public:
void remove_child(Fl_Type*) FL_OVERRIDE;
int is_parent() const FL_OVERRIDE {return 1;}
int is_group() const FL_OVERRIDE {return 1;}
ID id() const FL_OVERRIDE { return ID::Group; }
ID id() const FL_OVERRIDE { return ID_Group; }
Fl_Widget *enter_live_mode(int top=0) FL_OVERRIDE;
void leave_live_mode() FL_OVERRIDE;
void copy_properties() FL_OVERRIDE;
@ -68,7 +68,7 @@ public:
const char *type_name() FL_OVERRIDE {return pack_type_name;}
const char *alt_type_name() FL_OVERRIDE {return "fltk::PackedGroup";}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Pack_Type();}
ID id() const FL_OVERRIDE { return ID::Pack; }
ID id() const FL_OVERRIDE { return ID_Pack; }
Fl_Widget *enter_live_mode(int top=0) FL_OVERRIDE;
void copy_properties() FL_OVERRIDE;
};
@ -90,7 +90,7 @@ public:
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Flex_Type(); }
Fl_Widget *widget(int X,int Y,int W,int H) FL_OVERRIDE {
Fl_Flex *g = new Fl_Flex(X,Y,W,H); Fl_Group::current(0); return g;}
ID id() const FL_OVERRIDE { return ID::Flex; }
ID id() const FL_OVERRIDE { return ID_Flex; }
void write_properties(Fd_Project_Writer &f) FL_OVERRIDE;
void read_property(Fd_Project_Reader &f, const char *) FL_OVERRIDE;
Fl_Widget *enter_live_mode(int top=0) FL_OVERRIDE;
@ -117,7 +117,7 @@ public:
const char *alt_type_name() FL_OVERRIDE {return "fltk::TableGroup";}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Table_Type();}
Fl_Widget *widget(int X,int Y,int W,int H) FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Table; }
ID id() const FL_OVERRIDE { return ID_Table; }
Fl_Widget *enter_live_mode(int top=0) FL_OVERRIDE;
void add_child(Fl_Type*, Fl_Type*) FL_OVERRIDE;
void move_child(Fl_Type*, Fl_Type*) FL_OVERRIDE;
@ -145,7 +145,7 @@ public:
Fl_Type* click_test(int,int) FL_OVERRIDE;
void add_child(Fl_Type*, Fl_Type*) FL_OVERRIDE;
void remove_child(Fl_Type*) FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Tabs; }
ID id() const FL_OVERRIDE { return ID_Tabs; }
Fl_Widget *enter_live_mode(int top=0) FL_OVERRIDE;
int is_tabs() const FL_OVERRIDE {return 1;}
};
@ -161,7 +161,7 @@ public:
const char *type_name() FL_OVERRIDE {return scroll_type_name;}
const char *alt_type_name() FL_OVERRIDE {return "fltk::ScrollGroup";}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Scroll_Type();}
ID id() const FL_OVERRIDE { return ID::Scroll; }
ID id() const FL_OVERRIDE { return ID_Scroll; }
Fl_Widget *enter_live_mode(int top=0) FL_OVERRIDE;
void copy_properties() FL_OVERRIDE;
int is_scroll() const FL_OVERRIDE { return 1; }
@ -176,7 +176,7 @@ public:
const char *type_name() FL_OVERRIDE {return tile_type_name;}
const char *alt_type_name() FL_OVERRIDE {return "fltk::TileGroup";}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Tile_Type();}
ID id() const FL_OVERRIDE { return ID::Tile; }
ID id() const FL_OVERRIDE { return ID_Tile; }
void copy_properties() FL_OVERRIDE;
};
@ -198,7 +198,7 @@ public:
Fl_Widget *widget(int X,int Y,int W,int H) FL_OVERRIDE {
iwizard *g = new iwizard(X,Y,W,H); Fl_Group::current(0); return g;}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Wizard_Type();}
ID id() const FL_OVERRIDE { return ID::Wizard; }
ID id() const FL_OVERRIDE { return ID_Wizard; }
};
#endif // _FLUID_FL_GROUP_TYPE_H

4
fluid/Fl_Menu_Type.cxx
View File

@ -293,11 +293,11 @@ void Fl_Menu_Item_Type::write_static(Fd_Code_Writer& f) {
Fl_Type* t = parent; while (t->is_menu_item()) t = t->parent;
Fl_Type *q = 0;
// Go up one more level for Fl_Input_Choice, as these are groups themselves
if (t && (t->id() == Fl_Type::ID::Input_Choice))
if (t && (t->id() == Fl_Type::ID_Input_Choice))
f.write_c("->parent()");
for (t = t->parent; t && t->is_widget() && !is_class(); q = t, t = t->parent)
f.write_c("->parent()");
if (!q || (q->id() != Fl_Type::ID::Widget_Class))
if (!q || (q->id() != Fl_Type::ID_Widget_Class))
f.write_c("->user_data()");
f.write_c("))->%s_i(o,v);\n}\n", cn);
}

18
fluid/Fl_Menu_Type.h
View File

@ -47,21 +47,21 @@ public:
void write_item(Fd_Code_Writer& f);
void write_code1(Fd_Code_Writer& f) FL_OVERRIDE;
void write_code2(Fd_Code_Writer& f) FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Menu_Item; }
ID id() const FL_OVERRIDE { return ID_Menu_Item; }
};
class Fl_Radio_Menu_Item_Type : public Fl_Menu_Item_Type {
public:
const char* type_name() FL_OVERRIDE {return "RadioMenuItem";}
Fl_Type* make(Strategy strategy) FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Radio_Menu_Item; }
ID id() const FL_OVERRIDE { return ID_Radio_Menu_Item; }
};
class Fl_Checkbox_Menu_Item_Type : public Fl_Menu_Item_Type {
public:
const char* type_name() FL_OVERRIDE {return "CheckMenuItem";}
Fl_Type* make(Strategy strategy) FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Checkbox_Menu_Item; }
ID id() const FL_OVERRIDE { return ID_Checkbox_Menu_Item; }
};
class Fl_Submenu_Type : public Fl_Menu_Item_Type {
@ -77,7 +77,7 @@ public:
void add_child(Fl_Type*a, Fl_Type*b) FL_OVERRIDE {parent->add_child(a,b);}
void move_child(Fl_Type*a, Fl_Type*b) FL_OVERRIDE {parent->move_child(a,b);}
void remove_child(Fl_Type*a) FL_OVERRIDE {parent->remove_child(a);}
ID id() const FL_OVERRIDE { return ID::Submenu; }
ID id() const FL_OVERRIDE { return ID_Submenu; }
};
class Fl_Menu_Type : public Fl_Widget_Type {
@ -107,7 +107,7 @@ public:
Fl_Type* click_test(int x, int y) FL_OVERRIDE;
void write_code2(Fd_Code_Writer& f) FL_OVERRIDE;
void copy_properties() FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Menu_; }
ID id() const FL_OVERRIDE { return ID_Menu_; }
};
extern Fl_Menu_Item button_type_menu[];
@ -127,7 +127,7 @@ public:
Fl_Widget *widget(int X,int Y,int W,int H) FL_OVERRIDE {
return new Fl_Menu_Button(X,Y,W,H,"menu");}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Menu_Button_Type();}
ID id() const FL_OVERRIDE { return ID::Menu_Button; }
ID id() const FL_OVERRIDE { return ID_Menu_Button; }
};
extern Fl_Menu_Item dummymenu[];
@ -154,7 +154,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Choice_Type();}
ID id() const FL_OVERRIDE { return ID::Choice; }
ID id() const FL_OVERRIDE { return ID_Choice; }
};
class Fl_Input_Choice_Type : public Fl_Menu_Type { // FIXME: Composite: Fl_Group
@ -191,7 +191,7 @@ public:
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Input_Choice_Type();}
void build_menu() FL_OVERRIDE;
ID id() const FL_OVERRIDE { return ID::Input_Choice; }
ID id() const FL_OVERRIDE { return ID_Input_Choice; }
void copy_properties() FL_OVERRIDE;
};
@ -206,7 +206,7 @@ public:
const char *alt_type_name() FL_OVERRIDE {return "fltk::MenuBar";}
Fl_Widget *widget(int X,int Y,int W,int H) FL_OVERRIDE {return new Fl_Menu_Bar(X,Y,W,H);}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Menu_Bar_Type();}
ID id() const FL_OVERRIDE { return ID::Menu_Bar; }
ID id() const FL_OVERRIDE { return ID_Menu_Bar; }
};

2
fluid/Fl_Type.cxx
View File

@ -780,7 +780,7 @@ void Fl_Type::copy_properties() {
*/
int Fl_Type::user_defined(const char* cbname) const {
for (Fl_Type* p = Fl_Type::first; p ; p = p->next)
if ((p->id() == Fl_Type::ID::Function) && p->name() != 0)
if ((p->id() == Fl_Type::ID_Function) && p->name() != 0)
if (strncmp(p->name(), cbname, strlen(cbname)) == 0)
if (p->name()[strlen(cbname)] == '(')
return 1;

42
fluid/Fl_Type.h
View File

@ -87,30 +87,38 @@ protected:
public:
typedef enum {
enum ID {
// administrative
Base_, Widget_, Menu_,
ID_Base_, ID_Widget_, ID_Menu_,
// non-widget
Function, Code, CodeBlock, Decl, DeclBlock, Class, Widget_Class,
Comment, Data,
ID_Function, ID_Code, ID_CodeBlock,
ID_Decl, ID_DeclBlock, ID_Class,
ID_Widget_Class, ID_Comment, ID_Data,
// groups
Window, Group, Pack, Flex, Tabs, Scroll, Tile, Wizard,
ID_Window, ID_Group, ID_Pack,
ID_Flex, ID_Tabs, ID_Scroll,
ID_Tile, ID_Wizard,
// buttons
Button, Return_Button, Light_Button, Check_Button, Repeat_Button, Round_Button,
ID_Button, ID_Return_Button, ID_Light_Button,
ID_Check_Button, ID_Repeat_Button, ID_Round_Button,
// valuators
Slider, Scrollbar, Value_Slider, Adjuster, Counter, Spinner, Dial,
Roller, Value_Input, Value_Output,
ID_Slider, ID_Scrollbar, ID_Value_Slider,
ID_Adjuster, ID_Counter, ID_Spinner,
ID_Dial, ID_Roller, ID_Value_Input, ID_Value_Output,
// text
Input, Output, Text_Editor, Text_Display, File_Input, Simple_Terminal,
ID_Input, ID_Output, ID_Text_Editor,
ID_Text_Display, ID_File_Input, ID_Simple_Terminal,
// menus
Menu_Bar, Menu_Button, Choice, Input_Choice, Submenu, Menu_Item,
Checkbox_Menu_Item, Radio_Menu_Item,
ID_Menu_Bar, ID_Menu_Button, ID_Choice,
ID_Input_Choice, ID_Submenu, ID_Menu_Item,
ID_Checkbox_Menu_Item, ID_Radio_Menu_Item,
// browsers
Browser, Check_Browser, File_Browser, Tree, Help_View, Table,
ID_Browser, ID_Check_Browser, ID_File_Browser,
ID_Tree, ID_Help_View, ID_Table,
// misc
Box, Clock, Progress,
MaxID
} ID;
ID_Box, ID_Clock, ID_Progress,
ID_Max_
};
virtual ~Fl_Type();
virtual Fl_Type *make(Strategy strategy) = 0;
@ -196,8 +204,8 @@ public:
virtual int is_class() const {return 0;}
virtual int is_public() const {return 1;}
virtual ID id() const { return ID::Base_; }
virtual bool is_a(ID inID) { return (inID==ID::Base_); }
virtual ID id() const { return ID_Base_; }
virtual bool is_a(ID inID) { return (inID==ID_Base_); }
const char* class_name(const int need_nest) const;
const class Fl_Class_Type* is_in_class() const;

28
fluid/Fl_Widget_Type.cxx
View File

@ -59,7 +59,7 @@ const char* subclassname(Fl_Type* l) {
if (c) return c;
if (l->is_class()) return "Fl_Group";
if (p->o->type() == FL_WINDOW+1) return "Fl_Double_Window";
if (p->id() == Fl_Type::ID::Input) {
if (p->id() == Fl_Type::ID_Input) {
if (p->o->type() == FL_FLOAT_INPUT) return "Fl_Float_Input";
if (p->o->type() == FL_INT_INPUT) return "Fl_Int_Input";
}
@ -877,7 +877,7 @@ void h_cb(Fluid_Coord_Input *i, void *v) {
void wc_relative_cb(Fl_Choice *i, void *v) {
if (v == LOAD) {
if (current_widget->id() == Fl_Type::ID::Widget_Class) {
if (current_widget->id() == Fl_Type::ID_Widget_Class) {
i->show();
i->value(((Fl_Widget_Class_Type *)current_widget)->wc_relative);
} else {
@ -887,7 +887,7 @@ void wc_relative_cb(Fl_Choice *i, void *v) {
int mod = 0;
undo_checkpoint();
for (Fl_Type *o = Fl_Type::first; o; o = o->next) {
if (o->selected && (current_widget->id() == Fl_Type::ID::Widget_Class)) {
if (o->selected && (current_widget->id() == Fl_Type::ID_Widget_Class)) {
Fl_Widget_Class_Type *t = (Fl_Widget_Class_Type *)o;
t->wc_relative = i->value();
mod = 1;
@ -1046,9 +1046,9 @@ void box_cb(Fl_Choice* i, void *v) {
void down_box_cb(Fl_Choice* i, void *v) {
if (v == LOAD) {
int n;
if (current_widget->is_a(Fl_Type::ID::Button))
if (current_widget->is_a(Fl_Type::ID_Button))
n = ((Fl_Button*)(current_widget->o))->down_box();
else if (current_widget->id() == Fl_Type::ID::Input_Choice)
else if (current_widget->id() == Fl_Type::ID_Input_Choice)
n = ((Fl_Input_Choice*)(current_widget->o))->down_box();
else if (current_widget->is_menu_button())
n = ((Fl_Menu_*)(current_widget->o))->down_box();
@ -1067,11 +1067,11 @@ void down_box_cb(Fl_Choice* i, void *v) {
if (n == ZERO_ENTRY) n = 0;
for (Fl_Type *o = Fl_Type::first; o; o = o->next) {
if (o->selected) {
if (o->is_a(Fl_Type::ID::Button)) {
if (o->is_a(Fl_Type::ID_Button)) {
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
((Fl_Button*)(q->o))->down_box((Fl_Boxtype)n);
if (((Fl_Button*)(q->o))->value()) q->redraw();
} else if (o->id() == Fl_Type::ID::Input_Choice) {
} else if (o->id() == Fl_Type::ID_Input_Choice) {
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
((Fl_Input_Choice*)(q->o))->down_box((Fl_Boxtype)n);
} else if (o->is_menu_button()) {
@ -1277,9 +1277,9 @@ void visible_cb(Fl_Light_Button* i, void* v) {
n ? q->o->show() : q->o->hide();
q->redraw();
if (n && q->parent && q->parent->type_name()) {
if (q->parent->id() == Fl_Type::ID::Tabs) {
if (q->parent->id() == Fl_Type::ID_Tabs) {
((Fl_Tabs *)q->o->parent())->value(q->o);
} else if (q->parent->id() == Fl_Type::ID::Wizard) {
} else if (q->parent->id() == Fl_Type::ID_Wizard) {
((Fl_Wizard *)q->o->parent())->value(q->o);
}
}
@ -1438,7 +1438,7 @@ void color_common(Fl_Color c) {
if (o->selected && o->is_widget()) {
Fl_Widget_Type* q = (Fl_Widget_Type*)o;
q->o->color(c); q->o->redraw();
if (q->parent && (q->parent->id() == Fl_Type::ID::Tabs)) {
if (q->parent && (q->parent->id() == Fl_Type::ID_Tabs)) {
if (q->o->parent()) q->o->parent()->redraw();
}
mod = 1;
@ -2809,7 +2809,7 @@ void Fl_Widget_Type::write_static(Fd_Code_Writer& f) {
Fl_Type *q = 0;
for (Fl_Type* p = parent; p && p->is_widget(); q = p, p = p->parent)
f.write_c("->parent()");
if (!q || (q->id() != Fl_Type::ID::Widget_Class))
if (!q || (q->id() != Fl_Type::ID_Widget_Class))
f.write_c("->user_data()");
f.write_c("))->%s_i(o,v);\n}\n", cn);
}
@ -3035,7 +3035,7 @@ void Fl_Widget_Type::write_widget_code(Fd_Code_Writer& f) {
if (b->down_box()) f.write_c("%s%s->down_box(FL_%s);\n", f.indent(), var,
boxname(b->down_box()));
if (b->value()) f.write_c("%s%s->value(1);\n", f.indent(), var);
} else if (id() == Fl_Type::ID::Input_Choice) {
} else if (id() == Fl_Type::ID_Input_Choice) {
Fl_Input_Choice* b = (Fl_Input_Choice*)o;
if (b->down_box()) f.write_c("%s%s->down_box(FL_%s);\n", f.indent(), var,
boxname(b->down_box()));
@ -3211,7 +3211,7 @@ void Fl_Widget_Type::write_properties(Fd_Project_Writer &f) {
f.write_string("down_box"); f.write_word(boxname(b->down_box()));}
if (b->shortcut()) f.write_string("shortcut 0x%x", b->shortcut());
if (b->value()) f.write_string("value 1");
} else if (id() == Fl_Type::ID::Input_Choice) {
} else if (id() == Fl_Type::ID_Input_Choice) {
Fl_Input_Choice* b = (Fl_Input_Choice*)o;
if (b->down_box()) {
f.write_string("down_box"); f.write_word(boxname(b->down_box()));}
@ -3343,7 +3343,7 @@ void Fl_Widget_Type::read_property(Fd_Project_Reader &f, const char *c) {
if (x == ZERO_ENTRY) x = 0;
((Fl_Button*)o)->down_box((Fl_Boxtype)x);
}
} else if ((id() == Fl_Type::ID::Input_Choice) && !strcmp(c,"down_box")) {
} else if ((id() == Fl_Type::ID_Input_Choice) && !strcmp(c,"down_box")) {
const char* value = f.read_word();
if ((x = boxnumber(value))) {
if (x == ZERO_ENTRY) x = 0;

4
fluid/Fl_Widget_Type.h
View File

@ -104,8 +104,8 @@ public:
virtual int textstuff(int what, Fl_Font &, int &, Fl_Color &);
virtual Fl_Menu_Item *subtypes();
ID id() const FL_OVERRIDE { return ID::Widget_; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Widget_) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Widget_; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Widget_) ? true : super::is_a(inID); }
int is_widget() const FL_OVERRIDE;
int is_public() const FL_OVERRIDE;

4
fluid/Fl_Window_Type.cxx
View File

@ -698,8 +698,8 @@ void check_redraw_corresponding_parent(Fl_Type *s) {
if( !s || !s->selected || !s->is_widget()) return;
for (Fl_Type *i=s; i && i->parent; i=i->parent) {
if (i->is_group() && prev_parent &&
( (i->id() == Fl_Type::ID::Tabs) ||
(i->id() == Fl_Type::ID::Wizard))) {
( (i->id() == Fl_Type::ID_Tabs) ||
(i->id() == Fl_Type::ID_Wizard))) {
((Fl_Tabs*)((Fl_Widget_Type*)i)->o)->value(prev_parent->o);
return;
}

4
fluid/Fl_Window_Type.h
View File

@ -70,7 +70,7 @@ protected:
Fl_Widget *widget(int,int,int,int) FL_OVERRIDE {return 0;}
int recalc; // set by fix_overlay()
void moveallchildren();
ID id() const FL_OVERRIDE { return ID::Window; }
ID id() const FL_OVERRIDE { return ID_Window; }
void open_();
public:
@ -142,7 +142,7 @@ public:
void write_code2(Fd_Code_Writer& f) FL_OVERRIDE;
Fl_Type *make(Strategy strategy) FL_OVERRIDE;
const char *type_name() FL_OVERRIDE {return "widget_class";}
ID id() const FL_OVERRIDE { return ID::Widget_Class; }
ID id() const FL_OVERRIDE { return ID_Widget_Class; }
int is_parent() const FL_OVERRIDE {return 1;}
int is_code_block() const FL_OVERRIDE {return 1;}
int is_decl_block() const FL_OVERRIDE {return 1;}

4
fluid/code.cxx
View File

@ -663,7 +663,7 @@ Fl_Type* Fd_Code_Writer::write_code(Fl_Type* p) {
if (p->is_widget() && p->is_class()) {
// Handle widget classes specially
for (q = p->next; q && q->level > p->level;) {
if (q->id() != Fl_Type::ID::Function) q = write_code(q);
if (q->id() != Fl_Type::ID_Function) q = write_code(q);
else {
int level = q->level;
do {
@ -676,7 +676,7 @@ Fl_Type* Fd_Code_Writer::write_code(Fl_Type* p) {
p->write_code2(*this);
for (q = p->next; q && q->level > p->level;) {
if (q->id() == Fl_Type::ID::Function) q = write_code(q);
if (q->id() == Fl_Type::ID_Function) q = write_code(q);
else {
int level = q->level;
do {

80
fluid/factory.cxx
View File

@ -73,8 +73,8 @@ public:
return new Fl_Box(x, y, w, h, "label");
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Box_Type(); }
ID id() const FL_OVERRIDE { return ID::Box; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Box) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Box; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Box) ? true : super::is_a(inID); }
};
static Fl_Box_Type Fl_Box_type;
@ -96,8 +96,8 @@ public:
return new Fl_Clock(x, y, w, h);
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Clock_Type(); }
ID id() const FL_OVERRIDE { return ID::Clock; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Clock) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Clock; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Clock) ? true : super::is_a(inID); }
};
static Fl_Clock_Type Fl_Clock_type;
@ -121,8 +121,8 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Progress_Type(); }
ID id() const FL_OVERRIDE { return ID::Progress; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Progress) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Progress; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Progress) ? true : super::is_a(inID); }
};
static Fl_Progress_Type Fl_Progress_type;
@ -161,8 +161,8 @@ public:
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Button_Type(); }
int is_button() const FL_OVERRIDE { return 1; }
ID id() const FL_OVERRIDE { return ID::Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Button) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Button) ? true : super::is_a(inID); }
};
static Fl_Button_Type Fl_Button_type;
@ -188,8 +188,8 @@ public:
return new Fl_Return_Button(x, y, w, h, "Button");
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Return_Button_Type(); }
ID id() const FL_OVERRIDE { return ID::Return_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Return_Button) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Return_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Return_Button) ? true : super::is_a(inID); }
};
static Fl_Return_Button_Type Fl_Return_Button_type;
@ -213,8 +213,8 @@ public:
return new Fl_Repeat_Button(x, y, w, h, "Button");
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Repeat_Button_Type(); }
ID id() const FL_OVERRIDE { return ID::Repeat_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Repeat_Button) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Repeat_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Repeat_Button) ? true : super::is_a(inID); }
};
static Fl_Repeat_Button_Type Fl_Repeat_Button_type;
@ -237,8 +237,8 @@ public:
return new Fl_Light_Button(x, y, w, h, "Button");
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Light_Button_Type(); }
ID id() const FL_OVERRIDE { return ID::Light_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Light_Button) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Light_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Light_Button) ? true : super::is_a(inID); }
};
static Fl_Light_Button_Type Fl_Light_Button_type;
@ -261,8 +261,8 @@ public:
return new Fl_Check_Button(x, y, w, h, "Button");
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Check_Button_Type(); }
ID id() const FL_OVERRIDE { return ID::Check_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Check_Button) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Check_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Check_Button) ? true : super::is_a(inID); }
};
static Fl_Check_Button_Type Fl_Check_Button_type;
@ -285,8 +285,8 @@ public:
return new Fl_Round_Button(x, y, w, h, "Button");
}
Fl_Widget_Type *_make() FL_OVERRIDE { return new Fl_Round_Button_Type(); }
ID id() const FL_OVERRIDE { return ID::Round_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID::Round_Button) ? true : super::is_a(inID); }
ID id() const FL_OVERRIDE { return ID_Round_Button; }
bool is_a(ID inID) FL_OVERRIDE { return (inID==ID_Round_Button) ? true : super::is_a(inID); }
};
static Fl_Round_Button_Type Fl_Round_Button_type;
@ -333,7 +333,7 @@ public:
return b;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Browser_Type();}
ID id() const FL_OVERRIDE { return ID::Browser; }
ID id() const FL_OVERRIDE { return ID_Browser; }
};
static Fl_Browser_Type Fl_Browser_type;
@ -380,7 +380,7 @@ public:
return b;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Check_Browser_Type();}
ID id() const FL_OVERRIDE { return ID::Check_Browser; }
ID id() const FL_OVERRIDE { return ID_Check_Browser; }
};
static Fl_Check_Browser_Type Fl_Check_Browser_type;
@ -419,7 +419,7 @@ public:
return b;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Tree_Type();}
ID id() const FL_OVERRIDE { return ID::Tree; }
ID id() const FL_OVERRIDE { return ID_Tree; }
};
static Fl_Tree_Type Fl_Tree_type;
@ -450,7 +450,7 @@ public:
return b;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_File_Browser_Type();}
ID id() const FL_OVERRIDE { return ID::File_Browser; }
ID id() const FL_OVERRIDE { return ID_File_Browser; }
};
static Fl_File_Browser_Type Fl_File_Browser_type;
@ -483,7 +483,7 @@ public:
Fl_Widget *widget(int x,int y,int w,int h) FL_OVERRIDE {
return new Fl_Counter(x,y,w,h,"counter:");}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Counter_Type();}
ID id() const FL_OVERRIDE { return ID::Counter; }
ID id() const FL_OVERRIDE { return ID_Counter; }
};
static Fl_Counter_Type Fl_Counter_type;
@ -527,7 +527,7 @@ public:
return new Fl_Spinner(x,y,w,h,"spinner:");
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Spinner_Type();}
ID id() const FL_OVERRIDE { return ID::Spinner; }
ID id() const FL_OVERRIDE { return ID_Spinner; }
};
static Fl_Spinner_Type Fl_Spinner_type;
@ -576,7 +576,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Input_Type();}
ID id() const FL_OVERRIDE { return ID::Input; }
ID id() const FL_OVERRIDE { return ID_Input; }
void copy_properties() FL_OVERRIDE {
Fl_Widget_Type::copy_properties();
Fl_Input_ *d = (Fl_Input_*)live_widget, *s = (Fl_Input_*)o;
@ -626,7 +626,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_File_Input_Type();}
ID id() const FL_OVERRIDE { return ID::File_Input; }
ID id() const FL_OVERRIDE { return ID_File_Input; }
};
static Fl_File_Input_Type Fl_File_Input_type;
@ -667,7 +667,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Text_Display_Type();}
ID id() const FL_OVERRIDE { return ID::Text_Display; }
ID id() const FL_OVERRIDE { return ID_Text_Display; }
};
static Fl_Text_Display_Type Fl_Text_Display_type;
@ -708,7 +708,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Text_Editor_Type();}
ID id() const FL_OVERRIDE { return ID::Text_Editor; }
ID id() const FL_OVERRIDE { return ID_Text_Editor; }
};
static Fl_Text_Editor_Type Fl_Text_Editor_type;
@ -745,7 +745,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Simple_Terminal_Type();}
ID id() const FL_OVERRIDE { return ID::Simple_Terminal; }
ID id() const FL_OVERRIDE { return ID_Simple_Terminal; }
};
static Fl_Simple_Terminal_Type Fl_Simple_Terminal_type;
@ -776,7 +776,7 @@ public:
}
return myo;}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Help_View_Type();}
ID id() const FL_OVERRIDE { return ID::Help_View; }
ID id() const FL_OVERRIDE { return ID_Help_View; }
};
static Fl_Help_View_Type Fl_Help_View_type;
@ -792,7 +792,7 @@ public:
Fl_Widget *widget(int x,int y,int w,int h) FL_OVERRIDE {
return new Fl_Adjuster(x,y,w,h);}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Adjuster_Type();}
ID id() const FL_OVERRIDE { return ID::Adjuster; }
ID id() const FL_OVERRIDE { return ID_Adjuster; }
};
static Fl_Adjuster_Type Fl_Adjuster_type;
@ -813,7 +813,7 @@ public:
Fl_Widget *widget(int x,int y,int w,int h) FL_OVERRIDE {
return new Fl_Dial(x,y,w,h);}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Dial_Type();}
ID id() const FL_OVERRIDE { return ID::Dial; }
ID id() const FL_OVERRIDE { return ID_Dial; }
};
static Fl_Dial_Type Fl_Dial_type;
@ -833,7 +833,7 @@ public:
Fl_Widget *widget(int x,int y,int w,int h) FL_OVERRIDE {
return new Fl_Roller(x,y,w,h);}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Roller_Type();}
ID id() const FL_OVERRIDE { return ID::Roller; }
ID id() const FL_OVERRIDE { return ID_Roller; }
};
static Fl_Roller_Type Fl_Roller_type;
@ -857,7 +857,7 @@ public:
Fl_Widget *widget(int x,int y,int w,int h) FL_OVERRIDE {
return new Fl_Slider(x,y,w,h,"slider:");}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Slider_Type();}
ID id() const FL_OVERRIDE { return ID::Slider; }
ID id() const FL_OVERRIDE { return ID_Slider; }
};
static Fl_Slider_Type Fl_Slider_type;
@ -874,7 +874,7 @@ public:
Fl_Widget *widget(int x,int y,int w,int h) FL_OVERRIDE {
return new Fl_Scrollbar(x,y,w,h);}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Scrollbar_Type();}
ID id() const FL_OVERRIDE { return ID::Scrollbar; }
ID id() const FL_OVERRIDE { return ID_Scrollbar; }
};
static Fl_Scrollbar_Type Fl_Scrollbar_type;
@ -906,7 +906,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Output_Type();}
ID id() const FL_OVERRIDE { return ID::Output; }
ID id() const FL_OVERRIDE { return ID_Output; }
};
static Fl_Output_Type Fl_Output_type;
@ -935,7 +935,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Value_Input_Type();}
ID id() const FL_OVERRIDE { return ID::Value_Input; }
ID id() const FL_OVERRIDE { return ID_Value_Input; }
};
static Fl_Value_Input_Type Fl_Value_Input_type;
@ -975,7 +975,7 @@ public:
return myo;
}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Value_Output_Type();}
ID id() const FL_OVERRIDE { return ID::Value_Output; }
ID id() const FL_OVERRIDE { return ID_Value_Output; }
};
static Fl_Value_Output_Type Fl_Value_Output_type;
@ -1002,7 +1002,7 @@ public:
Fl_Widget *widget(int x,int y,int w,int h) FL_OVERRIDE {
return new Fl_Value_Slider(x,y,w,h,"slider:");}
Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Value_Slider_Type();}
ID id() const FL_OVERRIDE { return ID::Value_Slider; }
ID id() const FL_OVERRIDE { return ID_Value_Slider; }
};
static Fl_Value_Slider_Type Fl_Value_Slider_type;
@ -1172,7 +1172,7 @@ Fl_Type *add_new_widget_from_user(Fl_Type *inPrototype, Strategy strategy) {
if ((t->parent && t->parent->is_flex())) {
// Do not resize or layout the widget. Flex will need the widget size.
} else if (wt->id() == Fl_Type::ID::Menu_Bar) {
} else if (wt->id() == Fl_Type::ID_Menu_Bar) {
// Move and resize the menubar across the top of the window...
wt->o->resize(0, 0, w, h);
} else {

112
fluid/function_panel.cxx
View File

@ -727,31 +727,31 @@ Fl_Window* make_widgetbin() {
o->tooltip("Function");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Function"));
o->image(pixmap[Fl_Type::ID::Function]);
o->image(pixmap[Fl_Type::ID_Function]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(30, 21, 24, 24);
o->tooltip("Class");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Class"));
o->image(pixmap[Fl_Type::ID::Class]);
o->image(pixmap[Fl_Type::ID_Class]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(55, 21, 24, 24);
o->tooltip("Comment");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("comment"));
o->image(pixmap[Fl_Type::ID::Comment]);
o->image(pixmap[Fl_Type::ID_Comment]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(5, 46, 24, 24);
o->tooltip("Code");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Code"));
o->image(pixmap[Fl_Type::ID::Code]);
o->image(pixmap[Fl_Type::ID_Code]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(30, 46, 24, 24);
o->tooltip("Code Block");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("CodeBlock"));
o->image(pixmap[Fl_Type::ID::CodeBlock]);
o->image(pixmap[Fl_Type::ID_CodeBlock]);
} // Fl_Button* o
{ Widget_Bin_Window_Button* o = new Widget_Bin_Window_Button(55, 46, 24, 24);
o->tooltip("Widget Class");
@ -765,25 +765,25 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("widget_class"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Widget_Class]);
o->image(pixmap[Fl_Type::ID_Widget_Class]);
} // Widget_Bin_Window_Button* o
{ Fl_Button* o = new Fl_Button(5, 71, 24, 24);
o->tooltip("Declaration");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("decl"));
o->image(pixmap[Fl_Type::ID::Decl]);
o->image(pixmap[Fl_Type::ID_Decl]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(30, 71, 24, 24);
o->tooltip("Declaration Block");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("declblock"));
o->image(pixmap[Fl_Type::ID::DeclBlock]);
o->image(pixmap[Fl_Type::ID_DeclBlock]);
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(55, 71, 24, 24);
o->tooltip("Inline Data");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("data"));
o->image(pixmap[Fl_Type::ID::Data]);
o->image(pixmap[Fl_Type::ID_Data]);
} // Fl_Button* o
o->end();
} // Fl_Group* o
@ -801,7 +801,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Window"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Window]);
o->image(pixmap[Fl_Type::ID_Window]);
} // Widget_Bin_Window_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(114, 21, 24, 24);
o->tooltip("Group");
@ -815,7 +815,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Group"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Group]);
o->image(pixmap[Fl_Type::ID_Group]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(139, 21, 24, 24);
o->tooltip("Pack");
@ -829,7 +829,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Pack"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Pack]);
o->image(pixmap[Fl_Type::ID_Pack]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(89, 46, 24, 24);
o->tooltip("Tabs");
@ -843,7 +843,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tabs"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Tabs]);
o->image(pixmap[Fl_Type::ID_Tabs]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(114, 46, 24, 24);
o->tooltip("Scroll");
@ -857,7 +857,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scroll"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Scroll]);
o->image(pixmap[Fl_Type::ID_Scroll]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(139, 46, 24, 24);
o->tooltip("Flex");
@ -871,7 +871,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Flex"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Flex]);
o->image(pixmap[Fl_Type::ID_Flex]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(89, 71, 24, 24);
o->tooltip("Tile");
@ -885,7 +885,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tile"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Tile]);
o->image(pixmap[Fl_Type::ID_Tile]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(114, 71, 24, 24);
o->tooltip("Wizard");
@ -899,7 +899,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Wizard"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Wizard]);
o->image(pixmap[Fl_Type::ID_Wizard]);
} // Widget_Bin_Button* o
o->end();
} // Fl_Group* o
@ -917,7 +917,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Button"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Button]);
o->image(pixmap[Fl_Type::ID_Button]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(198, 21, 24, 24);
o->tooltip("Return Button");
@ -931,7 +931,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Return_Button"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Return_Button]);
o->image(pixmap[Fl_Type::ID_Return_Button]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(173, 46, 24, 24);
o->tooltip("Light Button");
@ -945,7 +945,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Light_Button"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Light_Button]);
o->image(pixmap[Fl_Type::ID_Light_Button]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(198, 46, 24, 24);
o->tooltip("Repeat Button");
@ -959,7 +959,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Repeat_Button"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Repeat_Button]);
o->image(pixmap[Fl_Type::ID_Repeat_Button]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(173, 71, 24, 24);
o->tooltip("Check Button");
@ -973,7 +973,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Button"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Check_Button]);
o->image(pixmap[Fl_Type::ID_Check_Button]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(198, 71, 24, 24);
o->tooltip("Round Button");
@ -987,7 +987,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Round_Button"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Round_Button]);
o->image(pixmap[Fl_Type::ID_Round_Button]);
} // Widget_Bin_Button* o
o->end();
} // Fl_Group* o
@ -1005,7 +1005,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Slider"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Slider]);
o->image(pixmap[Fl_Type::ID_Slider]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(257, 21, 24, 24);
o->tooltip("Scroll Bar");
@ -1019,7 +1019,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scrollbar"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Scrollbar]);
o->image(pixmap[Fl_Type::ID_Scrollbar]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(282, 21, 24, 24);
o->tooltip("Value Slider");
@ -1033,7 +1033,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Slider"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Value_Slider]);
o->image(pixmap[Fl_Type::ID_Value_Slider]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(307, 21, 24, 24);
o->tooltip("Value Output");
@ -1047,7 +1047,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Output"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Value_Output]);
o->image(pixmap[Fl_Type::ID_Value_Output]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(232, 46, 24, 24);
o->tooltip("Adjuster");
@ -1061,7 +1061,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Adjuster"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Adjuster]);
o->image(pixmap[Fl_Type::ID_Adjuster]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(257, 46, 24, 24);
o->tooltip("Counter");
@ -1075,7 +1075,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Counter"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Counter]);
o->image(pixmap[Fl_Type::ID_Counter]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(282, 46, 24, 24);
o->tooltip("Dial");
@ -1089,7 +1089,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Dial"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Dial]);
o->image(pixmap[Fl_Type::ID_Dial]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(232, 71, 24, 24);
o->tooltip("Roller");
@ -1103,7 +1103,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Roller"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Roller]);
o->image(pixmap[Fl_Type::ID_Roller]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(257, 71, 24, 24);
o->tooltip("Spinner");
@ -1117,7 +1117,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Spinner"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Spinner]);
o->image(pixmap[Fl_Type::ID_Spinner]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(282, 71, 24, 24);
o->tooltip("Value Input");
@ -1131,7 +1131,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Input"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Value_Input]);
o->image(pixmap[Fl_Type::ID_Value_Input]);
} // Widget_Bin_Button* o
o->end();
} // Fl_Group* o
@ -1149,7 +1149,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Input]);
o->image(pixmap[Fl_Type::ID_Input]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(366, 21, 24, 24);
o->tooltip("Output");
@ -1163,7 +1163,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Output"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Output]);
o->image(pixmap[Fl_Type::ID_Output]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(341, 46, 24, 24);
o->tooltip("Text Edit");
@ -1177,7 +1177,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Editor"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Text_Editor]);
o->image(pixmap[Fl_Type::ID_Text_Editor]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(366, 46, 24, 24);
o->tooltip("Text Display");
@ -1191,7 +1191,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Display"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Text_Display]);
o->image(pixmap[Fl_Type::ID_Text_Display]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(341, 71, 24, 24);
o->tooltip("File Input");
@ -1205,7 +1205,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Input"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::File_Input]);
o->image(pixmap[Fl_Type::ID_File_Input]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(366, 71, 24, 24);
o->tooltip("Simple Terminal");
@ -1219,7 +1219,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Simple_Terminal"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Simple_Terminal]);
o->image(pixmap[Fl_Type::ID_Simple_Terminal]);
} // Widget_Bin_Button* o
o->end();
} // Fl_Group* o
@ -1237,7 +1237,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input_Choice"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Input_Choice]);
o->image(pixmap[Fl_Type::ID_Input_Choice]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(425, 21, 24, 24);
o->tooltip("Menu Item");
@ -1251,7 +1251,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("menuitem"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Menu_Item]);
o->image(pixmap[Fl_Type::ID_Menu_Item]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(450, 21, 24, 24);
o->tooltip("Menu Bar");
@ -1265,7 +1265,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Bar"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Menu_Bar]);
o->image(pixmap[Fl_Type::ID_Menu_Bar]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(400, 46, 24, 24);
o->tooltip("Menu Button");
@ -1279,7 +1279,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Button"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Menu_Button]);
o->image(pixmap[Fl_Type::ID_Menu_Button]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(425, 46, 24, 24);
o->tooltip("Checkbox Menu Item");
@ -1293,7 +1293,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("checkmenuitem"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Checkbox_Menu_Item]);
o->image(pixmap[Fl_Type::ID_Checkbox_Menu_Item]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(450, 46, 24, 24);
o->tooltip("Sub Menu");
@ -1307,7 +1307,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("submenu"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Submenu]);
o->image(pixmap[Fl_Type::ID_Submenu]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(400, 71, 24, 24);
o->tooltip("Choice");
@ -1321,7 +1321,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Choice"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Choice]);
o->image(pixmap[Fl_Type::ID_Choice]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(425, 71, 24, 24);
o->tooltip("Radio Menu Item");
@ -1335,7 +1335,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("radiomenuitem"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Radio_Menu_Item]);
o->image(pixmap[Fl_Type::ID_Radio_Menu_Item]);
} // Widget_Bin_Button* o
o->end();
} // Fl_Group* o
@ -1353,7 +1353,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Browser"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Browser]);
o->image(pixmap[Fl_Type::ID_Browser]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(509, 21, 24, 24);
o->tooltip("Tree");
@ -1367,7 +1367,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tree"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Tree]);
o->image(pixmap[Fl_Type::ID_Tree]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(484, 46, 24, 24);
o->tooltip("Check Browser");
@ -1381,7 +1381,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Browser"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Check_Browser]);
o->image(pixmap[Fl_Type::ID_Check_Browser]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(509, 46, 24, 24);
o->tooltip("Help Browser");
@ -1395,7 +1395,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Help_View"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Help_View]);
o->image(pixmap[Fl_Type::ID_Help_View]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(484, 71, 24, 24);
o->tooltip("File Browser");
@ -1409,7 +1409,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Browser"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::File_Browser]);
o->image(pixmap[Fl_Type::ID_File_Browser]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(509, 71, 24, 24);
o->tooltip("Table");
@ -1423,7 +1423,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Table"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Table]);
o->image(pixmap[Fl_Type::ID_Table]);
} // Widget_Bin_Button* o
o->end();
} // Fl_Group* o
@ -1441,7 +1441,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Box"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Box]);
o->image(pixmap[Fl_Type::ID_Box]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(567, 21, 24, 24);
o->tooltip("Clock");
@ -1455,7 +1455,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Clock"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Clock]);
o->image(pixmap[Fl_Type::ID_Clock]);
} // Widget_Bin_Button* o
{ Widget_Bin_Button* o = new Widget_Bin_Button(542, 46, 24, 24);
o->tooltip("Progress");
@ -1469,7 +1469,7 @@ Fl_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Progress"));
o->align(Fl_Align(FL_ALIGN_CENTER));
o->when(FL_WHEN_RELEASE);
o->image(pixmap[Fl_Type::ID::Progress]);
o->image(pixmap[Fl_Type::ID_Progress]);
} // Widget_Bin_Button* o
o->end();
} // Fl_Group* o

116
fluid/function_panel.fl
View File

@ -561,56 +561,56 @@ else
user_data {"Function"}
callback type_make_cb
tooltip Function xywh {5 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Function]);}
code0 {o->image(pixmap[Fl_Type::ID_Function]);}
}
Fl_Button {} {
user_data {"Class"}
callback type_make_cb
tooltip Class xywh {30 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Class]);}
code0 {o->image(pixmap[Fl_Type::ID_Class]);}
}
Fl_Button {} {
user_data {"comment"}
callback type_make_cb
tooltip Comment xywh {55 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Comment]);}
code0 {o->image(pixmap[Fl_Type::ID_Comment]);}
}
Fl_Button {} {
user_data {"Code"}
callback type_make_cb
tooltip Code xywh {5 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Code]);}
code0 {o->image(pixmap[Fl_Type::ID_Code]);}
}
Fl_Button {} {
user_data {"CodeBlock"}
callback type_make_cb
tooltip {Code Block} xywh {30 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::CodeBlock]);}
code0 {o->image(pixmap[Fl_Type::ID_CodeBlock]);}
}
Fl_Button {} {
user_data {"widget_class"}
callback type_make_cb selected
callback type_make_cb
tooltip {Widget Class} xywh {55 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Widget_Class]);}
code0 {o->image(pixmap[Fl_Type::ID_Widget_Class]);}
class Widget_Bin_Window_Button
}
Fl_Button {} {
user_data {"decl"}
callback type_make_cb
tooltip Declaration xywh {5 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Decl]);}
code0 {o->image(pixmap[Fl_Type::ID_Decl]);}
}
Fl_Button {} {
user_data {"declblock"}
callback type_make_cb
tooltip {Declaration Block} xywh {30 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::DeclBlock]);}
code0 {o->image(pixmap[Fl_Type::ID_DeclBlock]);}
}
Fl_Button {} {
user_data {"data"}
callback type_make_cb
tooltip {Inline Data} xywh {55 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Data]);}
code0 {o->image(pixmap[Fl_Type::ID_Data]);}
}
}
Fl_Group {} {
@ -621,56 +621,56 @@ else
user_data {"Fl_Window"}
callback type_make_cb
tooltip Window xywh {89 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Window]);}
code0 {o->image(pixmap[Fl_Type::ID_Window]);}
class Widget_Bin_Window_Button
}
Fl_Button {} {
user_data {"Fl_Group"}
callback type_make_cb
tooltip Group xywh {114 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Group]);}
code0 {o->image(pixmap[Fl_Type::ID_Group]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Pack"}
callback type_make_cb
tooltip Pack xywh {139 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Pack]);}
code0 {o->image(pixmap[Fl_Type::ID_Pack]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Tabs"}
callback type_make_cb
tooltip Tabs xywh {89 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Tabs]);}
code0 {o->image(pixmap[Fl_Type::ID_Tabs]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Scroll"}
callback type_make_cb
tooltip Scroll xywh {114 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Scroll]);}
code0 {o->image(pixmap[Fl_Type::ID_Scroll]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Flex"}
callback type_make_cb
tooltip Flex xywh {139 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Flex]);}
code0 {o->image(pixmap[Fl_Type::ID_Flex]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Tile"}
callback type_make_cb
tooltip Tile xywh {89 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Tile]);}
code0 {o->image(pixmap[Fl_Type::ID_Tile]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Wizard"}
callback type_make_cb
tooltip Wizard xywh {114 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Wizard]);}
code0 {o->image(pixmap[Fl_Type::ID_Wizard]);}
class Widget_Bin_Button
}
}
@ -682,42 +682,42 @@ else
user_data {"Fl_Button"}
callback type_make_cb
tooltip Button xywh {173 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Button]);}
code0 {o->image(pixmap[Fl_Type::ID_Button]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Return_Button"}
callback type_make_cb
tooltip {Return Button} xywh {198 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Return_Button]);}
code0 {o->image(pixmap[Fl_Type::ID_Return_Button]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Light_Button"}
callback type_make_cb
tooltip {Light Button} xywh {173 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Light_Button]);}
code0 {o->image(pixmap[Fl_Type::ID_Light_Button]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Repeat_Button"}
callback type_make_cb
tooltip {Repeat Button} xywh {198 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Repeat_Button]);}
code0 {o->image(pixmap[Fl_Type::ID_Repeat_Button]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Check_Button"}
callback type_make_cb
tooltip {Check Button} xywh {173 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Check_Button]);}
code0 {o->image(pixmap[Fl_Type::ID_Check_Button]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Round_Button"}
callback type_make_cb
tooltip {Round Button} xywh {198 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Round_Button]);}
code0 {o->image(pixmap[Fl_Type::ID_Round_Button]);}
class Widget_Bin_Button
}
}
@ -729,70 +729,70 @@ else
user_data {"Fl_Slider"}
callback type_make_cb
tooltip Slider xywh {232 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Slider]);}
code0 {o->image(pixmap[Fl_Type::ID_Slider]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Scrollbar"}
callback type_make_cb
tooltip {Scroll Bar} xywh {257 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Scrollbar]);}
code0 {o->image(pixmap[Fl_Type::ID_Scrollbar]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Value_Slider"}
callback type_make_cb
tooltip {Value Slider} xywh {282 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Value_Slider]);}
code0 {o->image(pixmap[Fl_Type::ID_Value_Slider]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Value_Output"}
callback type_make_cb
tooltip {Value Output} xywh {307 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Value_Output]);}
code0 {o->image(pixmap[Fl_Type::ID_Value_Output]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Adjuster"}
callback type_make_cb
tooltip Adjuster xywh {232 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Adjuster]);}
code0 {o->image(pixmap[Fl_Type::ID_Adjuster]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Counter"}
callback type_make_cb
tooltip Counter xywh {257 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Counter]);}
code0 {o->image(pixmap[Fl_Type::ID_Counter]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Dial"}
callback type_make_cb
tooltip Dial xywh {282 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Dial]);}
code0 {o->image(pixmap[Fl_Type::ID_Dial]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Roller"}
callback type_make_cb
tooltip Roller xywh {232 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Roller]);}
code0 {o->image(pixmap[Fl_Type::ID_Roller]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Spinner"}
callback type_make_cb
tooltip Spinner xywh {257 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Spinner]);}
code0 {o->image(pixmap[Fl_Type::ID_Spinner]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Value_Input"}
callback type_make_cb
tooltip {Value Input} xywh {282 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Value_Input]);}
code0 {o->image(pixmap[Fl_Type::ID_Value_Input]);}
class Widget_Bin_Button
}
}
@ -804,42 +804,42 @@ else
user_data {"Fl_Input"}
callback type_make_cb
tooltip Input xywh {341 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Input]);}
code0 {o->image(pixmap[Fl_Type::ID_Input]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Output"}
callback type_make_cb
tooltip Output xywh {366 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Output]);}
code0 {o->image(pixmap[Fl_Type::ID_Output]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Text_Editor"}
callback type_make_cb
tooltip {Text Edit} xywh {341 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Text_Editor]);}
code0 {o->image(pixmap[Fl_Type::ID_Text_Editor]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Text_Display"}
callback type_make_cb
tooltip {Text Display} xywh {366 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Text_Display]);}
code0 {o->image(pixmap[Fl_Type::ID_Text_Display]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_File_Input"}
callback type_make_cb
tooltip {File Input} xywh {341 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::File_Input]);}
code0 {o->image(pixmap[Fl_Type::ID_File_Input]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Simple_Terminal"}
callback type_make_cb
tooltip {Simple Terminal} xywh {366 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Simple_Terminal]);}
code0 {o->image(pixmap[Fl_Type::ID_Simple_Terminal]);}
class Widget_Bin_Button
}
}
@ -851,56 +851,56 @@ else
user_data {"Fl_Input_Choice"}
callback type_make_cb
tooltip {Input Choice} xywh {400 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Input_Choice]);}
code0 {o->image(pixmap[Fl_Type::ID_Input_Choice]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"menuitem"}
callback type_make_cb
tooltip {Menu Item} xywh {425 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Menu_Item]);}
code0 {o->image(pixmap[Fl_Type::ID_Menu_Item]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Menu_Bar"}
callback type_make_cb
tooltip {Menu Bar} xywh {450 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Menu_Bar]);}
code0 {o->image(pixmap[Fl_Type::ID_Menu_Bar]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Menu_Button"}
callback type_make_cb
tooltip {Menu Button} xywh {400 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Menu_Button]);}
code0 {o->image(pixmap[Fl_Type::ID_Menu_Button]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"checkmenuitem"}
callback type_make_cb
tooltip {Checkbox Menu Item} xywh {425 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Checkbox_Menu_Item]);}
code0 {o->image(pixmap[Fl_Type::ID_Checkbox_Menu_Item]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"submenu"}
callback type_make_cb
tooltip {Sub Menu} xywh {450 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Submenu]);}
code0 {o->image(pixmap[Fl_Type::ID_Submenu]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Choice"}
callback type_make_cb
tooltip Choice xywh {400 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Choice]);}
code0 {o->image(pixmap[Fl_Type::ID_Choice]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"radiomenuitem"}
callback type_make_cb
tooltip {Radio Menu Item} xywh {425 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Radio_Menu_Item]);}
code0 {o->image(pixmap[Fl_Type::ID_Radio_Menu_Item]);}
class Widget_Bin_Button
}
}
@ -912,42 +912,42 @@ else
user_data {"Fl_Browser"}
callback type_make_cb
tooltip Browser xywh {484 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Browser]);}
code0 {o->image(pixmap[Fl_Type::ID_Browser]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Tree"}
callback type_make_cb
tooltip Tree xywh {509 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Tree]);}
code0 {o->image(pixmap[Fl_Type::ID_Tree]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Check_Browser"}
callback type_make_cb
tooltip {Check Browser} xywh {484 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Check_Browser]);}
code0 {o->image(pixmap[Fl_Type::ID_Check_Browser]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Help_View"}
callback type_make_cb
tooltip {Help Browser} xywh {509 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Help_View]);}
code0 {o->image(pixmap[Fl_Type::ID_Help_View]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_File_Browser"}
callback type_make_cb
tooltip {File Browser} xywh {484 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::File_Browser]);}
code0 {o->image(pixmap[Fl_Type::ID_File_Browser]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Table"}
callback type_make_cb
tooltip Table xywh {509 71 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Table]);}
code0 {o->image(pixmap[Fl_Type::ID_Table]);}
class Widget_Bin_Button
}
}
@ -959,21 +959,21 @@ else
user_data {"Fl_Box"}
callback type_make_cb
tooltip Box xywh {542 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Box]);}
code0 {o->image(pixmap[Fl_Type::ID_Box]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Clock"}
callback type_make_cb
callback type_make_cb selected
tooltip Clock xywh {567 21 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Clock]);}
code0 {o->image(pixmap[Fl_Type::ID_Clock]);}
class Widget_Bin_Button
}
Fl_Button {} {
user_data {"Fl_Progress"}
callback type_make_cb
tooltip Progress xywh {542 46 24 24} box THIN_UP_BOX
code0 {o->image(pixmap[Fl_Type::ID::Progress]);}
code0 {o->image(pixmap[Fl_Type::ID_Progress]);}
class Widget_Bin_Button
}
}

114
fluid/pixmaps.cxx
View File

@ -89,7 +89,7 @@ Fl_Pixmap *protected_pixmap;
Fl_Pixmap *invisible_pixmap;
Fl_Pixmap *compressed_pixmap;
Fl_Pixmap *pixmap[Fl_Type::ID::MaxID] = { NULL };
Fl_Pixmap *pixmap[Fl_Type::ID_Max_] = { NULL };
void loadPixmaps()
{
@ -101,72 +101,72 @@ void loadPixmaps()
invisible_pixmap = new Fl_Pixmap(invisible_xpm); invisible_pixmap->scale(16, 16);
compressed_pixmap = new Fl_Pixmap(compressed_xpm); compressed_pixmap->scale(16, 16);
pixmap[Fl_Type::ID::Window] = tmp = new Fl_Pixmap(flWindow_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Button] = tmp = new Fl_Pixmap(flButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Check_Button] = tmp = new Fl_Pixmap(flCheckButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Round_Button] = tmp = new Fl_Pixmap(flRoundButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Window] = tmp = new Fl_Pixmap(flWindow_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Button] = tmp = new Fl_Pixmap(flButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Check_Button] = tmp = new Fl_Pixmap(flCheckButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Round_Button] = tmp = new Fl_Pixmap(flRoundButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Box] = tmp = new Fl_Pixmap(flBox_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Group] = tmp = new Fl_Pixmap(flGroup_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Function] = tmp = new Fl_Pixmap(flFunction_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Code] = tmp = new Fl_Pixmap(flCode_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::CodeBlock] = tmp = new Fl_Pixmap(flCodeBlock_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Decl] = tmp = new Fl_Pixmap(flDeclaration_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Box] = tmp = new Fl_Pixmap(flBox_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Group] = tmp = new Fl_Pixmap(flGroup_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Function] = tmp = new Fl_Pixmap(flFunction_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Code] = tmp = new Fl_Pixmap(flCode_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_CodeBlock] = tmp = new Fl_Pixmap(flCodeBlock_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Decl] = tmp = new Fl_Pixmap(flDeclaration_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::DeclBlock] = tmp = new Fl_Pixmap(flDeclarationBlock_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Class] = tmp = new Fl_Pixmap(flClass_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Tabs] = tmp = new Fl_Pixmap(flTabs_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Input] = tmp = new Fl_Pixmap(flInput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Choice] = tmp = new Fl_Pixmap(flChoice_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_DeclBlock] = tmp = new Fl_Pixmap(flDeclarationBlock_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Class] = tmp = new Fl_Pixmap(flClass_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Tabs] = tmp = new Fl_Pixmap(flTabs_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Input] = tmp = new Fl_Pixmap(flInput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Choice] = tmp = new Fl_Pixmap(flChoice_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Menu_Item] = tmp = new Fl_Pixmap(flMenuitem_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Menu_Bar] = tmp = new Fl_Pixmap(flMenubar_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Submenu] = tmp = new Fl_Pixmap(flSubmenu_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Scroll] = tmp = new Fl_Pixmap(flScroll_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Tile] = tmp = new Fl_Pixmap(flTile_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Wizard] = tmp = new Fl_Pixmap(flWizard_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Menu_Item] = tmp = new Fl_Pixmap(flMenuitem_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Menu_Bar] = tmp = new Fl_Pixmap(flMenubar_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Submenu] = tmp = new Fl_Pixmap(flSubmenu_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Scroll] = tmp = new Fl_Pixmap(flScroll_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Tile] = tmp = new Fl_Pixmap(flTile_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Wizard] = tmp = new Fl_Pixmap(flWizard_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Pack] = tmp = new Fl_Pixmap(flPack_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Return_Button] = tmp = new Fl_Pixmap(flReturnButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Light_Button] = tmp = new Fl_Pixmap(flLightButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Repeat_Button] = tmp = new Fl_Pixmap(flRepeatButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Menu_Button] = tmp = new Fl_Pixmap(flMenuButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Pack] = tmp = new Fl_Pixmap(flPack_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Return_Button] = tmp = new Fl_Pixmap(flReturnButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Light_Button] = tmp = new Fl_Pixmap(flLightButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Repeat_Button] = tmp = new Fl_Pixmap(flRepeatButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Menu_Button] = tmp = new Fl_Pixmap(flMenuButton_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Output] = tmp = new Fl_Pixmap(flOutput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Text_Display] = tmp = new Fl_Pixmap(flTextDisplay_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Text_Editor] = tmp = new Fl_Pixmap(flTextEdit_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::File_Input] = tmp = new Fl_Pixmap(flFileInput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Browser] = tmp = new Fl_Pixmap(flBrowser_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Output] = tmp = new Fl_Pixmap(flOutput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Text_Display] = tmp = new Fl_Pixmap(flTextDisplay_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Text_Editor] = tmp = new Fl_Pixmap(flTextEdit_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_File_Input] = tmp = new Fl_Pixmap(flFileInput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Browser] = tmp = new Fl_Pixmap(flBrowser_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Check_Browser] = tmp = new Fl_Pixmap(flCheckBrowser_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::File_Browser] = tmp = new Fl_Pixmap(flFileBrowser_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Clock] = tmp = new Fl_Pixmap(flClock_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Help_View] = tmp = new Fl_Pixmap(flHelp_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Progress] = tmp = new Fl_Pixmap(flProgress_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Check_Browser] = tmp = new Fl_Pixmap(flCheckBrowser_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_File_Browser] = tmp = new Fl_Pixmap(flFileBrowser_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Clock] = tmp = new Fl_Pixmap(flClock_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Help_View] = tmp = new Fl_Pixmap(flHelp_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Progress] = tmp = new Fl_Pixmap(flProgress_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Slider] = tmp = new Fl_Pixmap(flSlider_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Scrollbar] = tmp = new Fl_Pixmap(flScrollBar_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Value_Slider] = tmp = new Fl_Pixmap(flValueSlider_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Adjuster] = tmp = new Fl_Pixmap(flAdjuster_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Counter] = tmp = new Fl_Pixmap(flCounter_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Slider] = tmp = new Fl_Pixmap(flSlider_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Scrollbar] = tmp = new Fl_Pixmap(flScrollBar_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Value_Slider] = tmp = new Fl_Pixmap(flValueSlider_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Adjuster] = tmp = new Fl_Pixmap(flAdjuster_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Counter] = tmp = new Fl_Pixmap(flCounter_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Dial] = tmp = new Fl_Pixmap(flDial_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Roller] = tmp = new Fl_Pixmap(flRoller_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Value_Input] = tmp = new Fl_Pixmap(flValueInput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Value_Output] = tmp = new Fl_Pixmap(flValueOutput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Comment] = tmp = new Fl_Pixmap(flComment_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Dial] = tmp = new Fl_Pixmap(flDial_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Roller] = tmp = new Fl_Pixmap(flRoller_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Value_Input] = tmp = new Fl_Pixmap(flValueInput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Value_Output] = tmp = new Fl_Pixmap(flValueOutput_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Comment] = tmp = new Fl_Pixmap(flComment_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Spinner] = tmp = new Fl_Pixmap(flSpinner_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Widget_Class] = tmp = new Fl_Pixmap(flWidgetClass_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Data] = tmp = new Fl_Pixmap(flData_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Tree] = tmp = new Fl_Pixmap(flTree_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Table] = tmp = new Fl_Pixmap(flTable_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Spinner] = tmp = new Fl_Pixmap(flSpinner_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Widget_Class] = tmp = new Fl_Pixmap(flWidgetClass_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Data] = tmp = new Fl_Pixmap(flData_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Tree] = tmp = new Fl_Pixmap(flTree_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Table] = tmp = new Fl_Pixmap(flTable_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Simple_Terminal] = tmp = new Fl_Pixmap(flSimpleTerminal_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Input_Choice] = tmp = new Fl_Pixmap(flInputChoice_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Checkbox_Menu_Item] = tmp = new Fl_Pixmap(flCheckMenuitem_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Radio_Menu_Item] = tmp = new Fl_Pixmap(flRadioMenuitem_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Simple_Terminal] = tmp = new Fl_Pixmap(flSimpleTerminal_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Input_Choice] = tmp = new Fl_Pixmap(flInputChoice_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Checkbox_Menu_Item] = tmp = new Fl_Pixmap(flCheckMenuitem_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Radio_Menu_Item] = tmp = new Fl_Pixmap(flRadioMenuitem_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID::Flex] = tmp = new Fl_Pixmap(flFlex_xpm); tmp->scale(16, 16);
pixmap[Fl_Type::ID_Flex] = tmp = new Fl_Pixmap(flFlex_xpm); tmp->scale(16, 16);
}

4
fluid/widget_browser.cxx
View File

@ -348,8 +348,8 @@ void Widget_Browser::item_draw(void *v, int X, int Y, int, int) const {
&& !l->is_window()
&& ((Fl_Widget_Type*)l)->o
&& !((Fl_Widget_Type*)l)->o->visible()
&& (!l->parent || ( (l->parent->id() != Fl_Type::ID::Tabs)
&& (l->parent->id() != Fl_Type::ID::Wizard) ) )
&& (!l->parent || ( (l->parent->id() != Fl_Type::ID_Tabs)
&& (l->parent->id() != Fl_Type::ID_Wizard) ) )
)
{
invisible_pixmap->draw(X - 17, Y);