diff options
Diffstat (limited to 'fluid')
32 files changed, 2095 insertions, 1777 deletions
diff --git a/fluid/CodeEditor.cxx b/fluid/CodeEditor.cxx index af1e0c8..a30777d 100644 --- a/fluid/CodeEditor.cxx +++ b/fluid/CodeEditor.cxx @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: CodeEditor.cxx 5498 2006-09-29 21:02:27Z mike $" // // Code editor widget for the Fast Light Tool Kit (FLTK). // @@ -406,6 +406,14 @@ CodeEditor::~CodeEditor() { } +CodeViewer::CodeViewer(int X, int Y, int W, int H, const char *L) +: CodeEditor(X, Y, W, H, L) +{ + default_key_function(kf_ignore); + remove_all_key_bindings(&key_bindings); + cursor_style(CARET_CURSOR); +} + // -// End of "$Id$". +// End of "$Id: CodeEditor.cxx 5498 2006-09-29 21:02:27Z mike $". // diff --git a/fluid/CodeEditor.h b/fluid/CodeEditor.h index 04c51bd..fa195b0 100644 --- a/fluid/CodeEditor.h +++ b/fluid/CodeEditor.h @@ -1,5 +1,5 @@ // -// "$Id$" +// "$Id: CodeEditor.h 5498 2006-09-29 21:02:27Z mike $" // // Code editor widget for the Fast Light Tool Kit (FLTK). // @@ -70,8 +70,19 @@ class CodeEditor : public Fl_Text_Editor { int top_line() { return get_absolute_top_line_number(); } }; +class CodeViewer : public CodeEditor { + + public: + + CodeViewer(int X, int Y, int W, int H, const char *L=0); + + protected: + + int handle(int ev) { return Fl_Text_Display::handle(ev); } +}; + #endif // !CodeEditor_h // -// End of "$Id$". +// End of "$Id: CodeEditor.h 5498 2006-09-29 21:02:27Z mike $". // diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx index a424789..8153086 100644 --- a/fluid/Fl_Function_Type.cxx +++ b/fluid/Fl_Function_Type.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Function_Type.cxx 4638 2005-11-04 15:16:24Z matt $" +// "$Id: Fl_Function_Type.cxx 5343 2006-08-23 11:00:22Z matt $" // // C function type code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -334,16 +334,23 @@ void Fl_Function_Type::write_code1() { write_c("%s%s %s {\n", rtype, star, s); } } - if (havewidgets) write_c(" %s* w;\n",subclassname(child)); + + if (havewidgets && !child->name()) write_c(" %s* w;\n", subclassname(child)); indentation += 2; } void Fl_Function_Type::write_code2() { + Fl_Type *child; + const char *var = "w"; + for (child = next; child && child->level > level; child = child->next) + if (child->is_window() && child->name()) var = child->name(); + if (ismain()) { - if (havewidgets) write_c(" w->show(argc, argv);\n"); + if (havewidgets) write_c(" %s->show(argc, argv);\n", var); write_c(" return Fl::run();\n"); - } else if (havewidgets && !constructor && !return_type) - write_c(" return w;\n"); + } else if (havewidgets && !constructor && !return_type) { + write_c(" return %s;\n", var); + } write_c("}\n"); indentation = 0; } @@ -499,6 +506,7 @@ Fl_Type *Fl_Decl_Type::make() { while (p && !p->is_decl_block()) p = p->parent; Fl_Decl_Type *o = new Fl_Decl_Type(); o->public_ = 0; + o->static_ = 1; o->name("int x;"); o->add(p); o->factory = this; @@ -508,11 +516,14 @@ Fl_Type *Fl_Decl_Type::make() { void Fl_Decl_Type::write_properties() { Fl_Type::write_properties(); if (public_) write_string("public"); + if (!static_) write_string("global"); } void Fl_Decl_Type::read_property(const char *c) { if (!strcmp(c,"public")) { public_ = 1; + } else if (!strcmp(c,"global")) { + static_ = 0; } else { Fl_Type::read_property(c); } @@ -522,6 +533,12 @@ void Fl_Decl_Type::open() { if (!decl_panel) make_decl_panel(); decl_input->static_value(name()); decl_public_button->value(public_); + decl_static_button->value(static_); + if (public_) + decl_static_button->label("extern"); + else + decl_static_button->label("static"); + char pp = public_; decl_panel->show(); const char* message = 0; for (;;) { // repeat as long as there are errors @@ -531,6 +548,14 @@ void Fl_Decl_Type::open() { if (w == decl_panel_cancel) goto BREAK2; else if (w == decl_panel_ok) break; else if (!w) Fl::wait(); + if (pp != decl_public_button->value()) { + pp = decl_public_button->value(); + if (pp) + decl_static_button->label("extern"); + else + decl_static_button->label("static"); + decl_static_button->redraw(); + } } const char*c = decl_input->value(); while (isspace(*c)) c++; @@ -541,6 +566,10 @@ void Fl_Decl_Type::open() { set_modflag(1); public_ = decl_public_button->value(); } + if (static_!=decl_static_button->value()) { + set_modflag(1); + static_ = decl_static_button->value(); + } break; } BREAK2: @@ -552,6 +581,17 @@ Fl_Decl_Type Fl_Decl_type; void Fl_Decl_Type::write_code1() { const char* c = name(); if (!c) return; + // handle a few keywords differently if inside a class + if (is_in_class() && ( + !strncmp(c,"class",5) && isspace(c[5]) + || !strncmp(c,"typedef",7) && isspace(c[7]) + || !strncmp(c,"FL_EXPORT",9) && isspace(c[9]) + || !strncmp(c,"struct",6) && isspace(c[6]) + ) ) { + write_public(public_); + write_h(" %s\n", c); + return; + } // handle putting #include, extern, using or typedef into decl: if (!isalpha(*c) && *c != '~' || !strncmp(c,"extern",6) && isspace(c[6]) @@ -567,18 +607,27 @@ void Fl_Decl_Type::write_code1() { write_c("%s\n", c); return; } + // find the first C++ style comment + const char* e = c+strlen(c), *csc = c; + while (csc<e && (csc[0]!='/' || csc[1]!='/')) csc++; + if (csc!=e) e = csc; // comment found // lose all trailing semicolons so I can add one: - const char* e = c+strlen(c); + while (e>c && e[-1]==' ') e--; while (e>c && e[-1]==';') e--; if (class_name(1)) { write_public(public_); - write_h(" %.*s;\n", (int)(e-c), c); + write_h(" %.*s; %s\n", (int)(e-c), c, csc); } else { if (public_) { - write_h("extern %.*s;\n", (int)(e-c), c); - write_c("%.*s;\n", (int)(e-c), c); + if (static_) + write_h("extern "); + write_h("%.*s; %s\n", (int)(e-c), c, csc); + if (static_) + write_c("%.*s; %s\n", (int)(e-c), c, csc); } else { - write_c("static %.*s;\n", (int)(e-c), c); + if (static_) + write_c("static "); + write_c("%.*s; %s\n", (int)(e-c), c, csc); } } } @@ -1044,9 +1093,8 @@ Fl_Class_Type Fl_Class_type; static Fl_Class_Type *current_class; extern Fl_Widget_Class_Type *current_widget_class; -extern int varused_test; void write_public(int state) { - if ((!current_class && !current_widget_class) || varused_test) return; + if (!current_class && !current_widget_class) return; if (current_class && current_class->write_public_state == state) return; if (current_widget_class && current_widget_class->write_public_state == state) return; if (current_class) current_class->write_public_state = state; @@ -1087,5 +1135,5 @@ int Fl_Class_Type::has_function(const char *rtype, const char *sig) const { } // -// End of "$Id: Fl_Function_Type.cxx 4638 2005-11-04 15:16:24Z matt $". +// End of "$Id: Fl_Function_Type.cxx 5343 2006-08-23 11:00:22Z matt $". // diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx index 16227f6..e11ee1f 100644 --- a/fluid/Fl_Group_Type.cxx +++ b/fluid/Fl_Group_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Group_Type.cxx 4553 2005-08-30 21:25:47Z matt $" +// "$Id: Fl_Group_Type.cxx 5609 2007-01-18 11:28:47Z matt $" // // Fl_Group object code for the Fast Light Tool Kit (FLTK). // @@ -7,7 +7,7 @@ // the Fl_Tabs widget, with special stuff to select tab items and // insure that only one is visible. // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -124,9 +124,12 @@ void Fl_Group_Type::write_code1() { } void Fl_Group_Type::write_code2() { + const char *var = name() ? name() : "o"; write_extra_code(); - write_c("%so->end();\n", indent()); - if (resizable()) write_c("%sFl_Group::current()->resizable(o);\n", indent()); + write_c("%s%s->end();\n", indent(), var); + if (resizable()) { + write_c("%sFl_Group::current()->resizable(%s);\n", indent(), var); + } write_block_close(); } @@ -161,10 +164,14 @@ Fl_Type* Fl_Tabs_Type::click_test(int x, int y) { Fl_Tabs *t = (Fl_Tabs*)o; Fl_Widget *a = t->which(x,y); if (!a) return 0; // didn't click on tab + // changing the visible tab has an impact on the generated + // source code, so mark this project as changed. + int changed = (a!=t->value()); // okay, run the tabs ui until they let go of mouse: t->handle(FL_PUSH); Fl::pushed(t); while (Fl::pushed()==t) Fl::wait(); + if (changed) set_modflag(1); return (Fl_Type*)(t->value()->user_data()); } @@ -271,6 +278,22 @@ void Fl_Group_Type::copy_properties() { const char scroll_type_name[] = "Fl_Scroll"; +Fl_Widget *Fl_Scroll_Type::enter_live_mode(int top) { + Fl_Group *grp = new Fl_Scroll(o->x(), o->y(), o->w(), o->h()); + grp->show(); + live_widget = grp; + if (live_widget) { + copy_properties(); + Fl_Type *n; + for (n = next; n && n->level > level; n = n->next) { + if (n->level == level+1) + n->enter_live_mode(); + } + grp->end(); + } + return live_widget; +} + Fl_Menu_Item scroll_type_menu[] = { {"BOTH", 0, 0, 0/*(void*)Fl_Scroll::BOTH*/}, {"HORIZONTAL", 0, 0, (void*)Fl_Scroll::HORIZONTAL}, @@ -303,5 +326,5 @@ void Fl_Tile_Type::copy_properties() { } // -// End of "$Id: Fl_Group_Type.cxx 4553 2005-08-30 21:25:47Z matt $". +// End of "$Id: Fl_Group_Type.cxx 5609 2007-01-18 11:28:47Z matt $". // diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index f16c7d3..f172d51 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Type.cxx 4727 2005-12-30 14:11:04Z matt $" +// "$Id: Fl_Menu_Type.cxx 5808 2007-05-10 12:06:31Z matt $" // // Menu item code for the Fast Light Tool Kit (FLTK). // @@ -9,7 +9,7 @@ // This file also contains code to make Fl_Menu_Button, Fl_Menu_Bar, // etc widgets. // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -244,10 +244,19 @@ void Fl_Menu_Item_Type::write_static() { // Write menu item variables... t = prev; while (t && t->is_menu_item()) t = t->prev; for (Fl_Type* q = t->next; q && q->is_menu_item(); q = q->next) { - const char *c = array_name((Fl_Menu_Item_Type *)q); + Fl_Menu_Item_Type *m = (Fl_Menu_Item_Type*)q; + const char *c = array_name(m); if (c) { - int i; const char* n = ((Fl_Menu_Item_Type *)q)->menu_name(i); - write_c("Fl_Menu_Item* %s::%s = %s::%s + %d;\n", k, c, k, n, i); + if (c==m->name()) { + // assign a menu item address directly to a variable + int i; + const char* n = ((Fl_Menu_Item_Type *)q)->menu_name(i); + write_c("Fl_Menu_Item* %s::%s = %s::%s + %d;\n", k, c, k, n, i); + } else { + // if the name is an array, only define the array. + // The actual assignment is in write_code1() + write_c("Fl_Menu_Item* %s::%s;\n", k, c); + } } } } @@ -299,9 +308,14 @@ void Fl_Menu_Item_Type::write_item() { } } else write_c("\"\""); - if (((Fl_Button*)o)->shortcut()) - write_c(", 0x%x, ", ((Fl_Button*)o)->shortcut()); - else + if (((Fl_Button*)o)->shortcut()) { + int s = ((Fl_Button*)o)->shortcut(); + if (use_FL_COMMAND && (s & (FL_CTRL|FL_META))) { + write_c(", FL_COMMAND|0x%x, ", s & ~(FL_CTRL|FL_META)); + } else { + write_c(", 0x%x, ", s); + } + } else write_c(", 0, "); if (callback()) { const char* k = is_name(callback()) ? 0 : class_name(1); @@ -336,8 +350,12 @@ void Fl_Menu_Item_Type::write_code1() { if (class_name(1)) { write_public(public_); write_h(" static Fl_Menu_Item *%s;\n", c); - } else - write_h("#define %s (%s+%d)\n", c, mname, i); + } else { + if (c==name()) + write_h("#define %s (%s+%d)\n", c, mname, i); + else + write_h("extern Fl_Menu_Item *%s;\n", c); + } } if (callback()) { @@ -351,10 +369,16 @@ void Fl_Menu_Item_Type::write_code1() { } int init = 0; + // if the name is an array variable, assign the value here + if (name() && strchr(name(), '[')) { + write_c("%s%s = &%s[%d];\n", indent(), name(), mname, i); + } if (image) { - write_c(" {Fl_Menu_Item* o = &%s[%d];\n", mname, i); - init = 1; - image->write_code(); + if (!init) { + init = 1; + write_c("%s{ Fl_Menu_Item* o = &%s[%d];\n", indent(), mname, i); + } + image->write_code("o"); } for (int n=0; n < NUM_EXTRA_CODE; n++) if (extra_code(n) && !isdeclare(extra_code(n))) { @@ -443,7 +467,7 @@ Fl_Type* Fl_Menu_Type::click_test(int, int) { void Fl_Menu_Type::write_code2() { if (next && next->is_menu_item()) - write_c("%so->menu(%s);\n", indent(), + write_c("%s%s->menu(%s);\n", indent(), name() ? name() : "o", unique_id(this, "menu", name(), label())); Fl_Widget_Type::write_code2(); } @@ -525,7 +549,13 @@ void Shortcut_Button::draw() { if (value()) draw_box(FL_DOWN_BOX, (Fl_Color)9); else draw_box(FL_UP_BOX, FL_WHITE); fl_font(FL_HELVETICA,14); fl_color(FL_FOREGROUND_COLOR); - fl_draw(fl_shortcut_label(svalue),x()+6,y(),w(),h(),FL_ALIGN_LEFT); + if (use_FL_COMMAND && (svalue & (FL_CTRL|FL_META))) { + char buf[1024]; + fl_snprintf(buf, 1023, "Command+%s", fl_shortcut_label(svalue&~(FL_CTRL|FL_META))); + fl_draw(buf,x()+6,y(),w(),h(),FL_ALIGN_LEFT); + } else { + fl_draw(fl_shortcut_label(svalue),x()+6,y(),w(),h(),FL_ALIGN_LEFT); + } } int Shortcut_Button::handle(int e) { @@ -543,7 +573,7 @@ int Shortcut_Button::handle(int e) { v = Fl::event_state()&(FL_META|FL_ALT|FL_CTRL|FL_SHIFT) | Fl::event_key(); if (v == FL_BackSpace && svalue) v = 0; } - if (v != svalue) {svalue = v; set_changed(); redraw(); do_callback(); } + if (v != svalue) {svalue = v; set_changed(); redraw(); do_callback(); } return 1; } else if (e == FL_UNFOCUS) { int c = changed(); value(0); if (c) set_changed(); @@ -564,15 +594,18 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) { i->svalue = ((Fl_Button*)(current_widget->o))->shortcut(); i->redraw(); } else { + int mod = 0; for (Fl_Type *o = Fl_Type::first; o; o = o->next) if (o->selected && o->is_button()) { Fl_Button* b = (Fl_Button*)(((Fl_Widget_Type*)o)->o); + if (b->shortcut()!=i->svalue) mod = 1; b->shortcut(i->svalue); if (o->is_menu_item()) ((Fl_Widget_Type*)o)->redraw(); } + if (mod) set_modflag(1); } } // -// End of "$Id: Fl_Menu_Type.cxx 4727 2005-12-30 14:11:04Z matt $". +// End of "$Id: Fl_Menu_Type.cxx 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx index aaf5f23..e6dda59 100644 --- a/fluid/Fl_Type.cxx +++ b/fluid/Fl_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Type.cxx 4630 2005-11-03 20:43:19Z matt $" +// "$Id: Fl_Type.cxx 5808 2007-05-10 12:06:31Z matt $" // // Widget type code for the Fast Light Tool Kit (FLTK). // @@ -15,7 +15,7 @@ // not in the linked list and are not written to files or // copied or otherwise examined. // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -622,6 +622,7 @@ Fl_Type::~Fl_Type() { int Fl_Type::is_parent() const {return 0;} int Fl_Type::is_widget() const {return 0;} int Fl_Type::is_valuator() const {return 0;} +int Fl_Type::is_spinner() const {return 0;} int Fl_Type::is_button() const {return 0;} int Fl_Type::is_menu_item() const {return 0;} int Fl_Type::is_menu_button() const {return 0;} @@ -708,7 +709,10 @@ void delete_all(int selected_only) { f = g; } else f = f->next; } - if(!selected_only) include_H_from_C=1; + if(!selected_only) { + include_H_from_C=1; + use_FL_COMMAND=0; + } selection_changed(0); } @@ -862,5 +866,5 @@ void Fl_Type::copy_properties() { } // -// End of "$Id: Fl_Type.cxx 4630 2005-11-03 20:43:19Z matt $". +// End of "$Id: Fl_Type.cxx 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index f4f50bc..02ce697 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -1,5 +1,5 @@ // -// "$Id: Fl_Type.h 4638 2005-11-04 15:16:24Z matt $" +// "$Id: Fl_Type.h 5808 2007-05-10 12:06:31Z matt $" // // Widget type header file for the Fast Light Tool Kit (FLTK). // @@ -11,7 +11,8 @@ // instance of this object. It could also have a "copy()" function, // but it was easier to implement this by using the file read/write // that is needed to save the setup anyways. -// Copyright 1998-2005 by Bill Spitzak and others. +// +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -131,6 +132,7 @@ public: virtual int is_widget() const; virtual int is_button() const; virtual int is_valuator() const; + virtual int is_spinner() const; virtual int is_menu_item() const; virtual int is_menu_button() const; virtual int is_group() const; @@ -199,6 +201,7 @@ public: class Fl_Decl_Type : public Fl_Type { char public_; + char static_; public: Fl_Type *make(); void write_code1(); @@ -438,6 +441,7 @@ public: virtual const char *type_name() {return scroll_type_name;} Fl_Widget_Type *_make() {return new Fl_Scroll_Type();} int pixmapID() { return 19; } + Fl_Widget *enter_live_mode(int top=0); void copy_properties(); }; @@ -542,6 +546,7 @@ public: virtual const char *type_name() {return "widget_class";} int pixmapID() { return 48; } int is_parent() const {return 1;} + int is_code_block() const {return 1;} int is_decl_block() const {return 1;} int is_class() const {return 1;} }; @@ -758,7 +763,8 @@ const char *c_check(const char *c, int type = 0); int storestring(const char *n, const char * & p, int nostrip=0); extern int include_H_from_C; +extern int use_FL_COMMAND; // -// End of "$Id: Fl_Type.h 4638 2005-11-04 15:16:24Z matt $". +// End of "$Id: Fl_Type.h 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index e107ab5..0ce353a 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Widget_Type.cxx 4723 2005-12-30 10:13:17Z matt $" +// "$Id: Fl_Widget_Type.cxx 5808 2007-05-10 12:06:31Z matt $" // // Widget type code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -32,6 +32,7 @@ #include "alignment_panel.h" #include <FL/fl_message.H> #include <FL/Fl_Slider.H> +#include <FL/Fl_Spinner.H> #include <FL/Fl_Window.H> #include "../src/flstring.h" #include <stdio.h> @@ -638,6 +639,14 @@ Fl_Menu_Item boxmenu[] = { {"PLASTIC_DOWN_BOX",0,0,(void *)FL_PLASTIC_DOWN_BOX}, {"PLASTIC_THIN_UP_BOX",0,0,(void *)FL_PLASTIC_THIN_UP_BOX}, {"PLASTIC_THIN_DOWN_BOX",0,0,(void *)FL_PLASTIC_THIN_DOWN_BOX}, +{"PLASTIC_ROUND_UP_BOX",0,0,(void *)FL_PLASTIC_ROUND_UP_BOX}, +{"PLASTIC_ROUND_DOWN_BOX",0,0,(void *)FL_PLASTIC_ROUND_DOWN_BOX}, +{"GTK_UP_BOX",0,0,(void *)FL_GTK_UP_BOX}, +{"GTK_DOWN_BOX",0,0,(void *)FL_GTK_DOWN_BOX}, +{"GTK_THIN_UP_BOX",0,0,(void *)FL_GTK_THIN_UP_BOX}, +{"GTK_THIN_DOWN_BOX",0,0,(void *)FL_GTK_THIN_DOWN_BOX}, +{"GTK_ROUND_UP_BOX",0,0,(void *)FL_GTK_ROUND_UP_BOX}, +{"GTK_ROUND_DOWN_BOX",0,0,(void *)FL_GTK_ROUND_DOWN_BOX}, {0}, {"frames",0,0,0,FL_SUBMENU}, {"UP_FRAME",0,0,(void *)FL_UP_FRAME}, @@ -652,6 +661,10 @@ Fl_Menu_Item boxmenu[] = { {"OVAL_FRAME",0,0,(void *)FL_OVAL_FRAME}, {"PLASTIC_UP_FRAME",0,0,(void *)FL_PLASTIC_UP_FRAME}, {"PLASTIC_DOWN_FRAME",0,0,(void *)FL_PLASTIC_DOWN_FRAME}, +{"GTK_UP_FRAME",0,0,(void *)FL_GTK_UP_FRAME}, +{"GTK_DOWN_FRAME",0,0,(void *)FL_GTK_DOWN_FRAME}, +{"GTK_THIN_UP_FRAME",0,0,(void *)FL_GTK_THIN_UP_FRAME}, +{"GTK_THIN_DOWN_FRAME",0,0,(void *)FL_GTK_THIN_DOWN_FRAME}, {0}, {0}}; @@ -873,6 +886,13 @@ void visible_cb(Fl_Light_Button* i, void* v) { n ? q->o->show() : q->o->hide(); q->redraw(); mod = 1; + if (n && q->parent && q->parent->type_name()) { + if (!strcmp(q->parent->type_name(), "Fl_Tabs")) { + ((Fl_Tabs *)q->o->parent())->value(q->o); + } else if (!strcmp(q->parent->type_name(), "Fl_Wizard")) { + ((Fl_Wizard *)q->o->parent())->value(q->o); + } + } } } if (mod) set_modflag(1); @@ -1421,7 +1441,7 @@ void slider_size_cb(Fl_Value_Input* i, void* v) { i->parent()->hide(); else i->parent()->show(); - if (current_widget->is_valuator()!=2) {i->deactivate(); return;} + if (current_widget->is_valuator()<2) {i->deactivate(); return;} i->activate(); i->value(((Fl_Slider*)(current_widget->o))->slider_size()); } else { @@ -1430,7 +1450,7 @@ void slider_size_cb(Fl_Value_Input* i, void* v) { for (Fl_Type *o = Fl_Type::first; o; o = o->next) { if (o->selected && o->is_widget()) { Fl_Widget_Type* q = (Fl_Widget_Type*)o; - if (q->is_valuator()==2) { + if (q->is_valuator()>=2) { ((Fl_Slider*)(q->o))->slider_size(n); q->o->redraw(); mod = 1; @@ -1443,9 +1463,16 @@ void slider_size_cb(Fl_Value_Input* i, void* v) { void min_cb(Fl_Value_Input* i, void* v) { if (v == LOAD) { - if (!current_widget->is_valuator()) {i->deactivate(); return;} - i->activate(); - i->value(((Fl_Valuator*)(current_widget->o))->minimum()); + if (current_widget->is_valuator()) { + i->activate(); + i->value(((Fl_Valuator*)(current_widget->o))->minimum()); + } else if (current_widget->is_spinner()) { + i->activate(); + i->value(((Fl_Spinner*)(current_widget->o))->minimum()); + } else { + i->deactivate(); + return; + } } else { int mod = 0; double n = i->value(); @@ -1456,7 +1483,11 @@ void min_cb(Fl_Value_Input* i, void* v) { ((Fl_Valuator*)(q->o))->minimum(n); q->o->redraw(); mod = 1; - } + } else if (q->is_spinner()) { + ((Fl_Spinner*)(q->o))->minimum(n); + q->o->redraw(); + mod = 1; + } } } if (mod) set_modflag(1); @@ -1465,9 +1496,16 @@ void min_cb(Fl_Value_Input* i, void* v) { void max_cb(Fl_Value_Input* i, void* v) { if (v == LOAD) { - if (!current_widget->is_valuator()) {i->deactivate(); return;} - i->activate(); - i->value(((Fl_Valuator*)(current_widget->o))->maximum()); + if (current_widget->is_valuator()) { + i->activate(); + i->value(((Fl_Valuator*)(current_widget->o))->maximum()); + } else if (current_widget->is_spinner()) { + i->activate(); + i->value(((Fl_Spinner*)(current_widget->o))->maximum()); + } else { + i->deactivate(); + return; + } } else { int mod = 0; double n = i->value(); @@ -1478,6 +1516,10 @@ void max_cb(Fl_Value_Input* i, void* v) { ((Fl_Valuator*)(q->o))->maximum(n); q->o->redraw(); mod = 1; + } else if (q->is_spinner()) { + ((Fl_Spinner*)(q->o))->maximum(n); + q->o->redraw(); + mod = 1; } } } @@ -1487,9 +1529,16 @@ void max_cb(Fl_Value_Input* i, void* v) { void step_cb(Fl_Value_Input* i, void* v) { if (v == LOAD) { - if (!current_widget->is_valuator()) {i->deactivate(); return;} - i->activate(); - i->value(((Fl_Valuator*)(current_widget->o))->step()); + if (current_widget->is_valuator()) { + i->activate(); + i->value(((Fl_Valuator*)(current_widget->o))->step()); + } else if (current_widget->is_spinner()) { + i->activate(); + i->value(((Fl_Spinner*)(current_widget->o))->step()); + } else { + i->deactivate(); + return; + } } else { int mod = 0; double n = i->value(); @@ -1497,9 +1546,13 @@ void step_cb(Fl_Value_Input* i, void* v) { if (o->selected && o->is_widget()) { Fl_Widget_Type* q = (Fl_Widget_Type*)o; if (q->is_valuator()) { - ((Fl_Valuator*)(q->o))->step(n); - q->o->redraw(); - mod = 1; + ((Fl_Valuator*)(q->o))->step(n); + q->o->redraw(); + mod = 1; + } else if (q->is_spinner()) { + ((Fl_Spinner*)(q->o))->step(n); + q->o->redraw(); + mod = 1; } } } @@ -1515,6 +1568,9 @@ void value_cb(Fl_Value_Input* i, void* v) { } else if (current_widget->is_button()) { i->activate(); i->value(((Fl_Button*)(current_widget->o))->value()); + } else if (current_widget->is_spinner()) { + i->activate(); + i->value(((Fl_Spinner*)(current_widget->o))->value()); } else i->deactivate(); } else { @@ -1530,6 +1586,9 @@ void value_cb(Fl_Value_Input* i, void* v) { ((Fl_Button*)(q->o))->value(n != 0); if (q->is_menu_item()) q->redraw(); mod = 1; + } else if (q->is_spinner()) { + ((Fl_Spinner*)(q->o))->value(n); + mod = 1; } } } @@ -1551,7 +1610,11 @@ void subtype_cb(Fl_Choice* i, void* v) { int j; for (j = 0;; j++) { if (!m[j].text) {j = 0; break;} - if (m[j].argument() == current_widget->o->type()) break; + if (current_widget->is_spinner()) { + if (m[j].argument() == ((Fl_Spinner*)current_widget->o)->type()) break; + } else { + if (m[j].argument() == current_widget->o->type()) break; + } } i->value(j); i->activate(); @@ -1564,9 +1627,12 @@ void subtype_cb(Fl_Choice* i, void* v) { if (o->selected && o->is_widget()) { Fl_Widget_Type* q = (Fl_Widget_Type*)o; if (q->subtypes()==m) { - q->o->type(n); - q->redraw(); - mod = 1; + if (q->is_spinner()) + ((Fl_Spinner*)q->o)->type(n); + else + q->o->type(n); + q->redraw(); + mod = 1; } } } @@ -1807,7 +1873,9 @@ int isdeclare(const char *c) { void Fl_Widget_Type::write_static() { const char* t = subclassname(this); - if (!subclass() || is_class()) write_declare("#include <FL/%s.H>", t); + if (!subclass() || (is_class() && !strncmp(t, "Fl_", 3))) { + write_declare("#include <FL/%s.H>", t); + } for (int n=0; n < NUM_EXTRA_CODE; n++) { if (extra_code(n) && isdeclare(extra_code(n))) write_declare("%s", extra_code(n)); @@ -1895,7 +1963,7 @@ const char *Fl_Type::callback_name() { } extern int varused_test, varused; - + void Fl_Widget_Type::write_code1() { const char* t = subclassname(this); const char *c = array_name(this); @@ -1913,17 +1981,49 @@ void Fl_Widget_Type::write_code1() { write_h(" static void %s(%s*, %s);\n", cn, t, ut); } // figure out if local variable will be used (prevent compiler warnings): - if (is_parent()) - varused = 1; - else { - varused_test = 1; varused = 0; - write_widget_code(); - varused_test = 0; + int wused = !name() && is_window(); + const char *ptr; + + varused = wused; + + if (!name() && !varused) { + varused |= is_parent(); + + if (!varused) { + varused_test = 1; + write_widget_code(); + varused_test = 0; + } + } + + if (!varused) { for (int n=0; n < NUM_EXTRA_CODE; n++) - if (extra_code(n) && !isdeclare(extra_code(n))) varused = 1; + if (extra_code(n) && !isdeclare(extra_code(n))) + { + int instring = 0; + int inname = 0; + for (ptr = extra_code(n); *ptr; ptr ++) { + if (instring) { + if (*ptr == '\\') ptr++; + else if (*ptr == '\"') instring = 0; + } else if (inname && !isalnum(*ptr & 255)) inname = 0; + else if (*ptr == '\"') instring = 1; + else if (isalnum(*ptr & 255) || *ptr == '_') { + size_t len = strspn(ptr, "0123456789_" + "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + + if (!strncmp(ptr, "o", len)) { + varused = 1; + break; + } else ptr += len - 1; + } + } + } } - write_c(indent()); - if (varused) write_c("{ %s* o = ", t); + + write_c("%s{ ", indent()); + if (varused) write_c("%s* o = ", t); if (name()) write_c("%s = ", name()); if (is_window()) { // Handle special case where user is faking a Fl_Group type as a window, @@ -1955,10 +2055,12 @@ void Fl_Widget_Type::write_code1() { } } write_c(");\n"); + indentation += 2; - if (is_window()) write_c("%sw = o;\n",indent()); - if (varused) write_widget_code(); + if (wused) write_c("%sw = o;\n", indent()); + + write_widget_code(); } void Fl_Widget_Type::write_color(const char* field, Fl_Color color) { @@ -1991,18 +2093,21 @@ void Fl_Widget_Type::write_color(const char* field, Fl_Color color) { case FL_DARK_CYAN: color_name = "FL_DARK_CYAN"; break; case FL_WHITE: color_name = "FL_WHITE"; break; } + const char *var = is_class() ? "this" : name() ? name() : "o"; if (color_name) { - write_c("%so->%s(%s);\n", indent(), field, color_name); + write_c("%s%s->%s(%s);\n", indent(), var, field, color_name); } else { - write_c("%so->%s((Fl_Color)%d);\n", indent(), field, color); + write_c("%s%s->%s((Fl_Color)%d);\n", indent(), var, field, color); } } // this is split from write_code1() for Fl_Window_Type: void Fl_Widget_Type::write_widget_code() { Fl_Widget* tplate = ((Fl_Widget_Type*)factory)->o; + const char *var = is_class() ? "this" : name() ? name() : "o"; + if (tooltip() && *tooltip()) { - write_c("%so->tooltip(",indent()); + write_c("%s%s->tooltip(",indent(), var); switch (i18n_type) { case 0 : /* None */ write_cstring(tooltip()); @@ -2022,92 +2127,131 @@ void Fl_Widget_Type::write_widget_code() { write_c(");\n"); } - if (o->type() != tplate->type() && !is_window()) - write_c("%so->type(%d);\n", indent(), o->type()); + if (is_spinner() && ((Fl_Spinner*)o)->type() != ((Fl_Spinner*)tplate)->type()) + write_c("%s%s->type(%d);\n", indent(), var, ((Fl_Spinner*)o)->type()); + else if (o->type() != tplate->type() && !is_window()) + write_c("%s%s->type(%d);\n", indent(), var, o->type()); if (o->box() != tplate->box() || subclass()) - write_c("%so->box(FL_%s);\n", indent(), boxname(o->box())); + write_c("%s%s->box(FL_%s);\n", indent(), var, boxname(o->box())); if (is_button()) { Fl_Button* b = (Fl_Button*)o; - if (b->down_box()) write_c("%so->down_box(FL_%s);\n", indent(), + if (b->down_box()) write_c("%s%s->down_box(FL_%s);\n", indent(), var, boxname(b->down_box())); - if (b->value()) write_c("%so->value(1);\n", indent()); - if (b->shortcut()) - write_c("%so->shortcut(0x%x);\n", indent(), b->shortcut()); + if (b->value()) write_c("%s%s->value(1);\n", indent(), var); + if (b->shortcut()) { + int s = b->shortcut(); + if (use_FL_COMMAND && (s & (FL_CTRL|FL_META))) { + write_c("%s%s->shortcut(FL_COMMAND|0x%x);\n", indent(), var, s & ~(FL_CTRL|FL_META)); + } else { + write_c("%s%s->shortcut(0x%x);\n", indent(), var, s); + } + } } else if (!strcmp(type_name(), "Fl_Input_Choice")) { Fl_Input_Choice* b = (Fl_Input_Choice*)o; - if (b->down_box()) write_c("%so->down_box(FL_%s);\n", indent(), + if (b->down_box()) write_c("%s%s->down_box(FL_%s);\n", indent(), var, boxname(b->down_box())); } else if (is_menu_button()) { Fl_Menu_* b = (Fl_Menu_*)o; - if (b->down_box()) write_c("%so->down_box(FL_%s);\n", indent(), + if (b->down_box()) write_c("%s%s->down_box(FL_%s);\n", indent(), var, boxname(b->down_box())); } if (o->color() != tplate->color() || subclass()) write_color("color", o->color()); if (o->selection_color() != tplate->selection_color() || subclass()) write_color("selection_color", o->selection_color()); - if (image) image->write_code(); - if (inactive) inactive->write_code(1); + if (image) image->write_code(var); + if (inactive) inactive->write_code(var, 1); if (o->labeltype() != tplate->labeltype() || subclass()) - write_c("%so->labeltype(FL_%s);\n", indent(), + write_c("%s%s->labeltype(FL_%s);\n", indent(), var, item_name(labeltypemenu, o->labeltype())); if (o->labelfont() != tplate->labelfont() || subclass()) - write_c("%so->labelfont(%d);\n", indent(), o->labelfont()); + write_c("%s%s->labelfont(%d);\n", indent(), var, o->labelfont()); if (o->labelsize() != tplate->labelsize() || subclass()) - write_c("%so->labelsize(%d);\n", indent(), o->labelsize()); + write_c("%s%s->labelsize(%d);\n", indent(), var, o->labelsize()); if (o->labelcolor() != tplate->labelcolor() || subclass()) write_color("labelcolor", o->labelcolor()); if (is_valuator()) { Fl_Valuator* v = (Fl_Valuator*)o; Fl_Valuator* f = (Fl_Valuator*)(tplate); if (v->minimum()!=f->minimum()) - write_c("%so->minimum(%g);\n", indent(), v->minimum()); + write_c("%s%s->minimum(%g);\n", indent(), var, v->minimum()); if (v->maximum()!=f->maximum()) - write_c("%so->maximum(%g);\n", indent(), v->maximum()); + write_c("%s%s->maximum(%g);\n", indent(), var, v->maximum()); if (v->step()!=f->step()) - write_c("%so->step(%g);\n", indent(), v->step()); - if (v->value()) - write_c("%so->value(%g);\n", indent(), v->value()); - if (is_valuator()==2) { + write_c("%s%s->step(%g);\n", indent(), var, v->step()); + if (v->value()) { + if (is_valuator()==3) { // Fl_Scrollbar::value(double) is nott available + write_c("%s%s->Fl_Slider::value(%g);\n", indent(), var, v->value()); + } else { + write_c("%s%s->value(%g);\n", indent(), var, v->value()); + } + } + if (is_valuator()>=2) { double x = ((Fl_Slider*)v)->slider_size(); double y = ((Fl_Slider*)f)->slider_size(); - if (x != y) write_c("%so->slider_size(%g);\n", indent(), x); + if (x != y) write_c("%s%s->slider_size(%g);\n", indent(), var, x); } } + if (is_spinner()) { + Fl_Spinner* v = (Fl_Spinner*)o; + Fl_Spinner* f = (Fl_Spinner*)(tplate); + if (v->minimum()!=f->minimum()) + write_c("%s%s->minimum(%g);\n", indent(), var, v->minimum()); + if (v->maximum()!=f->maximum()) + write_c("%s%s->maximum(%g);\n", indent(), var, v->maximum()); + if (v->step()!=f->step()) + write_c("%s%s->step(%g);\n", indent(), var, v->step()); + if (v->value()) + write_c("%s%s->value(%g);\n", indent(), var, v->value()); + } + {Fl_Font ff; int fs; Fl_Color fc; if (textstuff(4,ff,fs,fc)) { Fl_Font f; int s; Fl_Color c; textstuff(0,f,s,c); - if (f != ff) write_c("%so->textfont(%d);\n", indent(), f); - if (s != fs) write_c("%so->textsize(%d);\n", indent(), s); - if (c != fc) write_c("%so->textcolor(%d);\n",indent(), c); + if (f != ff) write_c("%s%s->textfont(%d);\n", indent(), var, f); + if (s != fs) write_c("%s%s->textsize(%d);\n", indent(), var, s); + if (c != fc) write_c("%s%s->textcolor(%d);\n",indent(), var, c); }} const char* ud = user_data(); if (class_name(1) && !parent->is_widget()) ud = "this"; if (callback()) { - write_c("%so->callback((Fl_Callback*)%s", indent(), callback_name()); + write_c("%s%s->callback((Fl_Callback*)%s", indent(), var, callback_name()); if (ud) write_c(", (void*)(%s));\n", ud); else write_c(");\n"); } else if (ud) { - write_c("%so->user_data((void*)(%s));\n", indent(), ud); + write_c("%s%s->user_data((void*)(%s));\n", indent(), var, ud); } if (o->align() != tplate->align() || subclass()) { int i = o->align(); - write_c("%so->align(%s", indent(), + write_c("%s%s->align(%s", indent(), var, item_name(alignmenu, i & ~FL_ALIGN_INSIDE)); if (i & FL_ALIGN_INSIDE) write_c("|FL_ALIGN_INSIDE"); write_c(");\n"); } - if (o->when() != tplate->when() || subclass()) - write_c("%so->when(%s);\n", indent(),item_name(whensymbolmenu, o->when())); + // avoid the unsupported combination of flegs when user sets + // "when" to "FL_WHEN_NEVER", but keeps the "no change" set. + // FIXME: This could be reflected in the GUI by graying out the button. + Fl_When ww = o->when(); + if (ww==FL_WHEN_NOT_CHANGED) + ww = FL_WHEN_NEVER; + if (ww != tplate->when() || subclass()) + write_c("%s%s->when(%s);\n", indent(), var, + item_name(whensymbolmenu, ww)); if (!o->visible() && o->parent()) - write_c("%so->hide();\n", indent()); + write_c("%s%s->hide();\n", indent(), var); if (!o->active()) - write_c("%so->deactivate();\n", indent()); + write_c("%s%s->deactivate();\n", indent(), var); if (!is_group() && resizable()) - write_c("%sFl_Group::current()->resizable(o);\n",indent()); - if (hotspot()) - write_c("%sw->hotspot(o);\n", indent()); + write_c("%sFl_Group::current()->resizable(%s);\n", indent(), var); + if (hotspot()) { + if (is_class()) + write_c("%shotspot(%s);\n", indent(), var); + else if (is_window()) + write_c("%s%s->hotspot(%s);\n", indent(), var, var); + else + write_c("%s%s->window()->hotspot(%s);\n", indent(), var, var); + } } void Fl_Widget_Type::write_extra_code() { @@ -2118,7 +2262,8 @@ void Fl_Widget_Type::write_extra_code() { void Fl_Widget_Type::write_block_close() { indentation -= 2; - if (is_parent() || varused) write_c("%s}\n", indent()); + write_c("%s} // %s* %s\n", indent(), subclassname(this), + name() ? name() : "o"); } void Fl_Widget_Type::write_code2() { @@ -2146,7 +2291,10 @@ void Fl_Widget_Type::write_properties() { } write_string("xywh {%d %d %d %d}", o->x(), o->y(), o->w(), o->h()); Fl_Widget* tplate = ((Fl_Widget_Type*)factory)->o; - if (o->type() != tplate->type() || is_window()) { + if (is_spinner() && ((Fl_Spinner*)o)->type() != ((Fl_Spinner*)tplate)->type()) { + write_string("type"); + write_word(item_name(subtypes(), ((Fl_Spinner*)o)->type())); + } else if (o->type() != tplate->type() || is_window()) { write_string("type"); write_word(item_name(subtypes(), o->type())); } @@ -2192,12 +2340,20 @@ void Fl_Widget_Type::write_properties() { if (v->maximum()!=f->maximum()) write_string("maximum %g",v->maximum()); if (v->step()!=f->step()) write_string("step %g",v->step()); if (v->value()!=0.0) write_string("value %g",v->value()); - if (is_valuator()==2) { + if (is_valuator()>=2) { double x = ((Fl_Slider*)v)->slider_size(); double y = ((Fl_Slider*)f)->slider_size(); if (x != y) write_string("slider_size %g", x); } } + if (is_spinner()) { + Fl_Spinner* v = (Fl_Spinner*)o; + Fl_Spinner* f = (Fl_Spinner*)(tplate); + if (v->minimum()!=f->minimum()) write_string("minimum %g",v->minimum()); + if (v->maximum()!=f->maximum()) write_string("maximum %g",v->maximum()); + if (v->step()!=f->step()) write_string("step %g",v->step()); + if (v->value()!=0.0) write_string("value %g",v->value()); + } {Fl_Font ff; int fs; Fl_Color fc; if (textstuff(4,ff,fs,fc)) { Fl_Font f; int s; Fl_Color c; textstuff(0,f,s,c); if (f != ff) write_string("textfont %d", f); @@ -2239,7 +2395,10 @@ void Fl_Widget_Type::read_property(const char *c) { } else if (!strcmp(c,"deimage")) { inactive_name(read_word()); } else if (!strcmp(c,"type")) { - o->type(item_number(subtypes(), read_word())); + if (is_spinner()) + ((Fl_Spinner*)o)->type(item_number(subtypes(), read_word())); + else + o->type(item_number(subtypes(), read_word())); } else if (!strcmp(c,"box")) { const char* value = read_word(); if ((x = boxnumber(value))) { @@ -2298,14 +2457,18 @@ void Fl_Widget_Type::read_property(const char *c) { if (sscanf(read_word(),"%d",&x) == 1) o->align(x); } else if (!strcmp(c,"when")) { if (sscanf(read_word(),"%d",&x) == 1) o->when(x); - } else if (!strcmp(c,"minimum") && is_valuator()) { - ((Fl_Valuator*)o)->minimum(strtod(read_word(),0)); - } else if (!strcmp(c,"maximum") && is_valuator()) { - ((Fl_Valuator*)o)->maximum(strtod(read_word(),0)); - } else if (!strcmp(c,"step") && is_valuator()) { - ((Fl_Valuator*)o)->step(strtod(read_word(),0)); - } else if (!strcmp(c,"value") && is_valuator()) { - ((Fl_Valuator*)o)->value(strtod(read_word(),0)); + } else if (!strcmp(c,"minimum")) { + if (is_valuator()) ((Fl_Valuator*)o)->minimum(strtod(read_word(),0)); + if (is_spinner()) ((Fl_Spinner*)o)->minimum(strtod(read_word(),0)); + } else if (!strcmp(c,"maximum")) { + if (is_valuator()) ((Fl_Valuator*)o)->maximum(strtod(read_word(),0)); + if (is_spinner()) ((Fl_Spinner*)o)->maximum(strtod(read_word(),0)); + } else if (!strcmp(c,"step")) { + if (is_valuator()) ((Fl_Valuator*)o)->step(strtod(read_word(),0)); + if (is_spinner()) ((Fl_Spinner*)o)->step(strtod(read_word(),0)); + } else if (!strcmp(c,"value")) { + if (is_valuator()) ((Fl_Valuator*)o)->value(strtod(read_word(),0)); + if (is_spinner()) ((Fl_Spinner*)o)->value(strtod(read_word(),0)); } else if ((!strcmp(c,"slider_size")||!strcmp(c,"size"))&&is_valuator()==2) { ((Fl_Slider*)o)->slider_size(strtod(read_word(),0)); } else if (!strcmp(c,"textfont")) { @@ -2503,11 +2666,20 @@ void Fl_Widget_Type::copy_properties() { d->maximum(s->maximum()); d->step(s->step()); d->value(s->value()); - if (is_valuator()==2) { + if (is_valuator()>=2) { Fl_Slider *d = (Fl_Slider*)live_widget, *s = (Fl_Slider*)o; d->slider_size(s->slider_size()); } } + + // copy all attributes specific to Fl_Spinner and derived classes + if (is_spinner()) { + Fl_Spinner* d = (Fl_Spinner*)live_widget, *s = (Fl_Spinner*)o; + d->minimum(s->minimum()); + d->maximum(s->maximum()); + d->step(s->step()); + d->value(s->value()); + } /* TODO: implement this {Fl_Font ff; int fs; Fl_Color fc; if (textstuff(4,ff,fs,fc)) { @@ -2533,5 +2705,5 @@ void Fl_Pack_Type::copy_properties() } // -// End of "$Id: Fl_Widget_Type.cxx 4723 2005-12-30 10:13:17Z matt $". +// End of "$Id: Fl_Widget_Type.cxx 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx index e4a3881..bcd4e16 100644 --- a/fluid/Fl_Window_Type.cxx +++ b/fluid/Fl_Window_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window_Type.cxx 4639 2005-11-04 15:21:26Z matt $" +// "$Id: Fl_Window_Type.cxx 5808 2007-05-10 12:06:31Z matt $" // // Window type code for the Fast Light Tool Kit (FLTK). // @@ -7,7 +7,7 @@ // for interacting with the overlay, which allows the user to // select, move, and resize the children widgets. // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -49,6 +49,7 @@ extern int snap; extern int show_guides; int include_H_from_C = 1; +int use_FL_COMMAND = 0; extern int i18n_type; extern const char* i18n_include; extern const char* i18n_function; @@ -183,6 +184,7 @@ extern const char* code_file_name; void show_project_cb(Fl_Widget *, void *) { if(project_window==0) make_project_window(); include_H_from_C_button->value(include_H_from_C); + use_FL_COMMAND_button->value(use_FL_COMMAND); header_file_input->value(header_file_name); code_file_input->value(code_file_name); i18n_type_chooser->value(i18n_type); @@ -247,13 +249,20 @@ void code_input_cb(Fl_Input* i, void*) { code_file_name = i->value(); } -void include_H_from_C_button_cb(Fl_Light_Button* b, void*) { +void include_H_from_C_button_cb(Fl_Check_Button* b, void*) { if (include_H_from_C != b->value()) { set_modflag(1); include_H_from_C = b->value(); } } +void use_FL_COMMAND_button_cb(Fl_Check_Button* b, void*) { + if (use_FL_COMMAND != b->value()) { + set_modflag(1); + use_FL_COMMAND = b->value(); + } +} + //////////////////////////////////////////////////////////////// Fl_Menu_Item window_type_menu[] = { @@ -1279,23 +1288,27 @@ void Fl_Window_Type::write_code1() { } void Fl_Window_Type::write_code2() { + const char *var = is_class() ? "this" : name() ? name() : "o"; write_extra_code(); - if (modal) write_c("%so->set_modal();\n", indent()); - else if (non_modal) write_c("%so->set_non_modal();\n", indent()); - if (!((Fl_Window*)o)->border()) write_c("%so->clear_border();\n", indent()); + if (modal) write_c("%s%s->set_modal();\n", indent(), var); + else if (non_modal) write_c("%s%s->set_non_modal();\n", indent(), var); + if (!((Fl_Window*)o)->border()) { + write_c("%s%s->clear_border();\n", indent(), var); + } if (xclass) { - write_c("%so->xclass(", indent()); + write_c("%s%s->xclass(", indent(), var); write_cstring(xclass); write_c(");\n"); } if (sr_max_w || sr_max_h) { - write_c("%so->size_range(%d, %d, %d, %d);\n", indent(), sr_min_w, sr_min_h, sr_max_w, sr_max_h); + write_c("%s%s->size_range(%d, %d, %d, %d);\n", indent(), var, + sr_min_w, sr_min_h, sr_max_w, sr_max_h); } else if (sr_min_w || sr_min_h) { - write_c("%so->size_range(%d, %d);\n", indent(), sr_min_w, sr_min_h); + write_c("%s%s->size_range(%d, %d);\n", indent(), var, sr_min_w, sr_min_h); } - write_c("%so->end();\n", indent()); + write_c("%s%s->end();\n", indent(), var); if (((Fl_Window*)o)->resizable() == o) - write_c("%so->resizable(o);\n", indent()); + write_c("%s%s->resizable(%s);\n", indent(), var, var); write_block_close(); } @@ -1414,10 +1427,7 @@ void Fl_Widget_Class_Type::write_code1() { if (!c) c = "Fl_Group"; write_h("\nclass %s : public %s {\n", name(), c); - if (!strcmp(c, "Fl_Window") || - !strcmp(c, "Fl_Double_Window") || - !strcmp(c, "Fl_Gl_Window") || - !strcmp(c, "Fl_Overlay_Window")) { + if (strstr(c, "Window")) { write_h(" void _%s();\n", name()); write_h("public:\n"); write_h(" %s(int X, int Y, int W, int H, const char *L = 0);\n", name()); @@ -1435,7 +1445,7 @@ void Fl_Widget_Class_Type::write_code1() { write_c("}\n\n"); write_c("void %s::_%s() {\n", name(), name()); - write_c(" %s *w = this;\n", name()); +// write_c(" %s *w = this;\n", name()); } else { write_h("public:\n"); write_h(" %s(int X, int Y, int W, int H, const char *L = 0);\n", name()); @@ -1447,7 +1457,7 @@ void Fl_Widget_Class_Type::write_code1() { write_c(" : %s(X, Y, W, H, L) {\n", c); } - write_c(" %s *o = this;\n", name()); +// write_c(" %s *o = this;\n", name()); write_widget_code(); } @@ -1500,5 +1510,5 @@ void Fl_Window_Type::copy_properties() { // -// End of "$Id: Fl_Window_Type.cxx 4639 2005-11-04 15:21:26Z matt $". +// End of "$Id: Fl_Window_Type.cxx 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx index c385190..5733614 100644 --- a/fluid/Fluid_Image.cxx +++ b/fluid/Fluid_Image.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fluid_Image.cxx 4607 2005-10-26 09:08:01Z matt $" +// "$Id: Fluid_Image.cxx 5266 2006-07-26 19:52:28Z mike $" // // Pixmap label support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -118,9 +118,9 @@ void Fluid_Image::write_static() { } } -void Fluid_Image::write_code(int inactive) { +void Fluid_Image::write_code(const char *var, int inactive) { if (!img) return; - write_c("%so->%s(%s);\n", indent(), inactive ? "deimage" : "image", + write_c("%s%s->%s(%s);\n", indent(), var, inactive ? "deimage" : "image", unique_id(this, "image", fl_filename_name(name()), 0)); } @@ -225,5 +225,5 @@ Fluid_Image *ui_find_image(const char *oldname) { // -// End of "$Id: Fluid_Image.cxx 4607 2005-10-26 09:08:01Z matt $". +// End of "$Id: Fluid_Image.cxx 5266 2006-07-26 19:52:28Z mike $". // diff --git a/fluid/Fluid_Image.h b/fluid/Fluid_Image.h index 063fa1e..985b8e4 100644 --- a/fluid/Fluid_Image.h +++ b/fluid/Fluid_Image.h @@ -1,5 +1,5 @@ // -// "$Id: Fluid_Image.h 4288 2005-04-16 00:13:17Z mike $" +// "$Id: Fluid_Image.h 5266 2006-07-26 19:52:28Z mike $" // // Image header file for the Fast Light Tool Kit (FLTK). // @@ -50,7 +50,7 @@ public: void image(Fl_Widget *); // set the image of this widget void deimage(Fl_Widget *); // set the deimage of this widget void write_static(); - void write_code(int inactive = 0); + void write_code(const char *var, int inactive = 0); const char *name() const {return name_;} }; @@ -62,5 +62,5 @@ extern const char *ui_find_image_name; #endif // -// End of "$Id: Fluid_Image.h 4288 2005-04-16 00:13:17Z mike $". +// End of "$Id: Fluid_Image.h 5266 2006-07-26 19:52:28Z mike $". // diff --git a/fluid/Makefile b/fluid/Makefile index 18f4716..59d4b57 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,9 +1,9 @@ # -# "$Id: Makefile 4759 2006-01-15 19:26:08Z mike $" +# "$Id: Makefile 5728 2007-03-06 17:03:25Z matt $" # # FLUID makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2005 by Bill Spitzak and others. +# Copyright 1998-2007 by Bill Spitzak and others. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -57,19 +57,20 @@ all: $(FLUID) fluid$(EXEEXT) fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ ../lib/$(IMGLIBNAME) echo Linking $@... - $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) + $(INSTALL_BIN) fluid fluid.app/Contents/MacOS $(POSTBUILD) $@ ../FL/mac.r - $(CP) $@ fluid.app/Contents/MacOS fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ ../src/$(IMGDSONAME) echo Linking $@... - $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r clean: -$(RM) *.o core.* *~ *.bck *.bck -$(RM) core fluid$(EXEEXT) fluid-shared$(EXEEXT) + -$(RM) fluid.app/Contents/MacOS/fluid depend: $(CPPFILES) makedepend -Y -I.. -f makedepend $(CPPFILES) @@ -79,33 +80,32 @@ include makedepend install: all echo "Installing FLUID in $(DESTDIR)$(bindir)..." - -$(MKDIR) $(DESTDIR)$(bindir) - $(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT) - $(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT) + -$(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) install-linux: - -$(MKDIR) $(DESTDIR)/usr/share/applnk/Development - $(CP) fluid.desktop $(DESTDIR)/usr/share/applnk/Development + -$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Development + $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applnk/Development for size in 16 32 48 64 128; do \ if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \ - $(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ + $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ fi; \ - $(CP) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ + $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ done - -$(MKDIR) $(DESTDIR)/usr/share/mimelnk/application - $(CP) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application + -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application + $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application install-osx: - -$(MKDIR) $(DESTDIR)/Applications/fluid.app - -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents - $(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist - $(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo - -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS - $(LN) $(bindir)/fluid $(DESTDIR)/Application/fluid.app/Contents/MacOS/fluid - -$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources - $(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources + echo Installing Fluid in $(DESTDIR)/Applications... + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents + $(INSTALL_DATA) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist + $(INSTALL_DATA) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS + $(RM) $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid + $(LN) $(bindir)/fluid $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid + -$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources + $(INSTALL_DATA) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources uninstall: $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT) @@ -133,5 +133,5 @@ rebuild: ./fluid -c widget_panel.fl # -# End of "$Id: Makefile 4759 2006-01-15 19:26:08Z mike $". +# End of "$Id: Makefile 5728 2007-03-06 17:03:25Z matt $". # diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx index e742f99..b3088f7 100644 --- a/fluid/about_panel.cxx +++ b/fluid/about_panel.cxx @@ -1,5 +1,5 @@ // -// "$Id: about_panel.cxx 4748 2006-01-15 02:26:54Z mike $" +// "$Id: about_panel.cxx 5438 2006-09-17 14:58:25Z mike $" // // About dialog for the Fast Light Tool Kit (FLTK). // @@ -25,10 +25,10 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #include "about_panel.h" -void show_help(const char *name); +void show_help(const char *name); Fl_Double_Window *about_panel=(Fl_Double_Window *)0; @@ -271,38 +271,36 @@ static void cb_Close(Fl_Return_Button* o, void*) { } Fl_Double_Window* make_about_panel() { - Fl_Double_Window* w; - { Fl_Double_Window* o = about_panel = new Fl_Double_Window(315, 175, "About FLUID"); - w = o; - o->color(FL_LIGHT1); - o->selection_color(FL_DARK1); - w->hotspot(o); + { about_panel = new Fl_Double_Window(315, 175, "About FLUID"); + about_panel->color(FL_LIGHT1); + about_panel->selection_color(FL_DARK1); + about_panel->hotspot(about_panel); { Fl_Box* o = new Fl_Box(10, 10, 115, 120); o->image(image_fluid); - } - { Fl_Box* o = new Fl_Box(135, 10, 170, 69, "FLTK User\nInterface Designer\nVersion 1.1.7"); + } // Fl_Box* o + { Fl_Box* o = new Fl_Box(135, 10, 170, 69, "FLTK User\nInterface Designer\nVersion 1.1.8"); o->color((Fl_Color)12); o->selection_color(FL_DARK1); o->labelfont(1); o->labelsize(18); o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); - } + } // Fl_Box* o { Fl_Box* o = new Fl_Box(135, 89, 170, 42, "Copyright 1998-2006 by\nBill Spitzak and others"); o->align(132|FL_ALIGN_INSIDE); - } + } // Fl_Box* o { Fl_Button* o = new Fl_Button(89, 141, 123, 25, "View License..."); o->labelcolor(FL_DARK_BLUE); o->callback((Fl_Callback*)cb_View); - } + } // Fl_Button* o { Fl_Return_Button* o = new Fl_Return_Button(222, 141, 83, 25, "Close"); o->callback((Fl_Callback*)cb_Close); - } - o->set_non_modal(); - o->end(); - } - return w; + } // Fl_Return_Button* o + about_panel->set_non_modal(); + about_panel->end(); + } // Fl_Double_Window* about_panel + return about_panel; } // -// End of "$Id: about_panel.cxx 4748 2006-01-15 02:26:54Z mike $". +// End of "$Id: about_panel.cxx 5438 2006-09-17 14:58:25Z mike $". // diff --git a/fluid/about_panel.fl b/fluid/about_panel.fl index e068ba6..03ee041 100644 --- a/fluid/about_panel.fl +++ b/fluid/about_panel.fl @@ -1,9 +1,9 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0107 +version 1.0108 header_name {.h} code_name {.cxx} comment {// -// "$Id: about_panel.fl 4748 2006-01-15 02:26:54Z mike $" +// "$Id: about_panel.fl 5438 2006-09-17 14:58:25Z mike $" // // About dialog for the Fast Light Tool Kit (FLTK). // @@ -28,7 +28,7 @@ comment {// // // http://www.fltk.org/str.php // -} {selected in_source in_header +} {in_source in_header } decl {void show_help(const char *name);} {public @@ -46,7 +46,7 @@ Function {make_about_panel()} {open Fl_Box {} { label {FLTK User Interface Designer -Version 1.1.7} +Version 1.1.8} selected xywh {135 10 170 69} color 12 selection_color 47 labelfont 1 labelsize 18 align 21 } Fl_Box {} { @@ -69,6 +69,6 @@ Bill Spitzak and others} comment { // -// End of "$Id: about_panel.fl 4748 2006-01-15 02:26:54Z mike $". +// End of "$Id: about_panel.fl 5438 2006-09-17 14:58:25Z mike $". //} {in_source in_header } diff --git a/fluid/about_panel.h b/fluid/about_panel.h index 13c9eaa..7063851 100644 --- a/fluid/about_panel.h +++ b/fluid/about_panel.h @@ -1,5 +1,5 @@ // -// "$Id: about_panel.h 4748 2006-01-15 02:26:54Z mike $" +// "$Id: about_panel.h 5412 2006-09-04 20:01:15Z matt $" // // About dialog for the Fast Light Tool Kit (FLTK). // @@ -25,12 +25,12 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #ifndef about_panel_h #define about_panel_h #include <FL/Fl.H> -extern void show_help(const char *name); +extern void show_help(const char *name); #include <FL/Fl_Double_Window.H> extern Fl_Double_Window *about_panel; #include <FL/Fl_Box.H> @@ -40,5 +40,5 @@ Fl_Double_Window* make_about_panel(); #endif // -// End of "$Id: about_panel.h 4748 2006-01-15 02:26:54Z mike $". +// End of "$Id: about_panel.h 5412 2006-09-04 20:01:15Z matt $". // diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx index cc480cc..0fa1402 100644 --- a/fluid/alignment_panel.cxx +++ b/fluid/alignment_panel.cxx @@ -1,5 +1,5 @@ // -// "$Id: alignment_panel.cxx 4632 2005-11-03 22:16:52Z mike $" +// "$Id: alignment_panel.cxx 5808 2007-05-10 12:06:31Z matt $" // // Setting and shell dialogs for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #include "alignment_panel.h" @@ -39,7 +39,9 @@ Fl_Input *header_file_input=(Fl_Input *)0; Fl_Input *code_file_input=(Fl_Input *)0; -Fl_Light_Button *include_H_from_C_button=(Fl_Light_Button *)0; +Fl_Check_Button *include_H_from_C_button=(Fl_Check_Button *)0; + +Fl_Check_Button *use_FL_COMMAND_button=(Fl_Check_Button *)0; Fl_Choice *i18n_type_chooser=(Fl_Choice *)0; @@ -59,112 +61,116 @@ Fl_Input *i18n_set_input=(Fl_Input *)0; Fl_Input *i18n_function_input=(Fl_Input *)0; Fl_Double_Window* make_project_window() { - Fl_Double_Window* w; - { Fl_Double_Window* o = project_window = new Fl_Double_Window(345, 185, "Project Settings"); - w = o; - { Fl_Button* o = new Fl_Button(293, 156, 42, 20, "Close"); + { project_window = new Fl_Double_Window(358, 207, "Project Settings"); + { Fl_Button* o = new Fl_Button(293, 175, 52, 20, "Close"); o->tooltip("Close this dialog."); o->labelsize(11); o->callback((Fl_Callback*)cb_Close); - } - { Fl_Tabs* o = new Fl_Tabs(10, 10, 325, 138); - o->selection_color((Fl_Color)4); + } // Fl_Button* o + { Fl_Tabs* o = new Fl_Tabs(10, 10, 335, 151); + o->selection_color((Fl_Color)12); o->labelsize(11); - { Fl_Group* o = new Fl_Group(10, 30, 325, 116, "Output"); + { Fl_Group* o = new Fl_Group(10, 30, 335, 131, "Output"); o->labelsize(11); - { Fl_Box* o = new Fl_Box(20, 40, 304, 15, "Use \"name.ext\" to set name or just \".ext\" to set extension."); - o->labelsize(11); - o->align(132|FL_ALIGN_INSIDE); - } - { Fl_Input* o = header_file_input = new Fl_Input(96, 60, 228, 20, "Header File:"); - o->tooltip("The name of the generated header file."); - o->box(FL_THIN_DOWN_BOX); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)header_input_cb, (void*)(1)); - o->when(FL_WHEN_CHANGED); - } - { Fl_Input* o = code_file_input = new Fl_Input(97, 85, 227, 20, "Code File:"); - o->tooltip("The name of the generated code file."); - o->box(FL_THIN_DOWN_BOX); - o->labelfont(1); + { Fl_Box* o = new Fl_Box(15, 40, 325, 15, "Use \"name.ext\" to set name or just \".ext\" to set extension."); o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)code_input_cb, (void*)(1)); - o->when(FL_WHEN_CHANGED); - } - { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(166, 110, 158, 20, "Include Header from Code"); - o->tooltip("Include the header file from the code file."); - o->value(1); - o->labelsize(11); - o->callback((Fl_Callback*)include_H_from_C_button_cb); - } + o->align(FL_ALIGN_WRAP|FL_ALIGN_INSIDE); + } // Fl_Box* o + { header_file_input = new Fl_Input(96, 60, 228, 20, "Header File:"); + header_file_input->tooltip("The name of the generated header file."); + header_file_input->box(FL_THIN_DOWN_BOX); + header_file_input->labelfont(1); + header_file_input->labelsize(11); + header_file_input->textfont(4); + header_file_input->textsize(11); + header_file_input->callback((Fl_Callback*)header_input_cb, (void*)(1)); + header_file_input->when(FL_WHEN_CHANGED); + } // Fl_Input* header_file_input + { code_file_input = new Fl_Input(97, 85, 227, 20, "Code File:"); + code_file_input->tooltip("The name of the generated code file."); + code_file_input->box(FL_THIN_DOWN_BOX); + code_file_input->labelfont(1); + code_file_input->labelsize(11); + code_file_input->textfont(4); + code_file_input->textsize(11); + code_file_input->callback((Fl_Callback*)code_input_cb, (void*)(1)); + code_file_input->when(FL_WHEN_CHANGED); + } // Fl_Input* code_file_input + { include_H_from_C_button = new Fl_Check_Button(95, 110, 145, 20, "Include Header from Code"); + include_H_from_C_button->tooltip("Include the header file from the code file."); + include_H_from_C_button->down_box(FL_DOWN_BOX); + include_H_from_C_button->labelsize(11); + include_H_from_C_button->callback((Fl_Callback*)include_H_from_C_button_cb); + } // Fl_Check_Button* include_H_from_C_button + { use_FL_COMMAND_button = new Fl_Check_Button(95, 130, 245, 20, "Generate menu shortcuts using FL_COMMAND"); + use_FL_COMMAND_button->tooltip("Replace FL_CTRL with FL_COMMAND when generating menu shortcut code."); + use_FL_COMMAND_button->down_box(FL_DOWN_BOX); + use_FL_COMMAND_button->labelsize(11); + use_FL_COMMAND_button->callback((Fl_Callback*)use_FL_COMMAND_button_cb); + } // Fl_Check_Button* use_FL_COMMAND_button o->end(); - } - { Fl_Group* o = new Fl_Group(10, 30, 325, 116, "Internationalization"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(10, 30, 335, 131, "Internationalization"); o->labelsize(11); o->hide(); - { Fl_Choice* o = i18n_type_chooser = new Fl_Choice(80, 42, 100, 20, "Use:"); - o->tooltip("Type of internationalization to use."); - o->box(FL_THIN_UP_BOX); - o->down_box(FL_BORDER_BOX); - o->labelfont(1); - o->labelsize(11); - o->textsize(11); - o->callback((Fl_Callback*)i18n_type_cb); - o->menu(menu_i18n_type_chooser); - } - { Fl_Input* o = i18n_include_input = new Fl_Input(80, 67, 245, 20, "#include:"); - o->tooltip("The include file for internationalization."); - o->box(FL_THIN_DOWN_BOX); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)i18n_text_cb); - } - { Fl_Input* o = i18n_file_input = new Fl_Input(80, 92, 245, 20, "File:"); - o->tooltip("The name of the message catalog."); - o->box(FL_THIN_DOWN_BOX); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)i18n_text_cb); - } - { Fl_Input* o = i18n_set_input = new Fl_Input(80, 117, 245, 20, "Set:"); - o->tooltip("The message set number."); - o->type(2); - o->box(FL_THIN_DOWN_BOX); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)i18n_text_cb); - } - { Fl_Input* o = i18n_function_input = new Fl_Input(80, 92, 245, 20, "Function:"); - o->tooltip("The function to call to internationalize the labels and tooltips."); - o->box(FL_THIN_DOWN_BOX); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)i18n_text_cb); - } + { i18n_type_chooser = new Fl_Choice(80, 42, 100, 20, "Use:"); + i18n_type_chooser->tooltip("Type of internationalization to use."); + i18n_type_chooser->box(FL_THIN_UP_BOX); + i18n_type_chooser->down_box(FL_BORDER_BOX); + i18n_type_chooser->labelfont(1); + i18n_type_chooser->labelsize(11); + i18n_type_chooser->textsize(11); + i18n_type_chooser->callback((Fl_Callback*)i18n_type_cb); + i18n_type_chooser->menu(menu_i18n_type_chooser); + } // Fl_Choice* i18n_type_chooser + { i18n_include_input = new Fl_Input(80, 67, 245, 20, "#include:"); + i18n_include_input->tooltip("The include file for internationalization."); + i18n_include_input->box(FL_THIN_DOWN_BOX); + i18n_include_input->labelfont(1); + i18n_include_input->labelsize(11); + i18n_include_input->textfont(4); + i18n_include_input->textsize(11); + i18n_include_input->callback((Fl_Callback*)i18n_text_cb); + } // Fl_Input* i18n_include_input + { i18n_file_input = new Fl_Input(80, 92, 245, 20, "File:"); + i18n_file_input->tooltip("The name of the message catalog."); + i18n_file_input->box(FL_THIN_DOWN_BOX); + i18n_file_input->labelfont(1); + i18n_file_input->labelsize(11); + i18n_file_input->textfont(4); + i18n_file_input->textsize(11); + i18n_file_input->callback((Fl_Callback*)i18n_text_cb); + } // Fl_Input* i18n_file_input + { i18n_set_input = new Fl_Input(80, 117, 245, 20, "Set:"); + i18n_set_input->tooltip("The message set number."); + i18n_set_input->type(2); + i18n_set_input->box(FL_THIN_DOWN_BOX); + i18n_set_input->labelfont(1); + i18n_set_input->labelsize(11); + i18n_set_input->textfont(4); + i18n_set_input->textsize(11); + i18n_set_input->callback((Fl_Callback*)i18n_text_cb); + } // Fl_Input* i18n_set_input + { i18n_function_input = new Fl_Input(80, 92, 245, 20, "Function:"); + i18n_function_input->tooltip("The function to call to internationalize the labels and tooltips."); + i18n_function_input->box(FL_THIN_DOWN_BOX); + i18n_function_input->labelfont(1); + i18n_function_input->labelsize(11); + i18n_function_input->textfont(4); + i18n_function_input->textsize(11); + i18n_function_input->callback((Fl_Callback*)i18n_text_cb); + } // Fl_Input* i18n_function_input o->end(); - } + } // Fl_Group* o o->end(); - } - o->set_modal(); - o->end(); - } - return w; + } // Fl_Tabs* o + project_window->set_modal(); + project_window->end(); + } // Fl_Double_Window* project_window + return project_window; } -Fl_Text_Buffer *shell_run_buffer; -void scheme_cb(Fl_Choice *, void *); +Fl_Text_Buffer *shell_run_buffer; +void scheme_cb(Fl_Choice *, void *); Fl_Double_Window *settings_window=(Fl_Double_Window *)0; @@ -174,6 +180,7 @@ Fl_Menu_Item menu_scheme_choice[] = { {"Default", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, {"None", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, {"Plastic", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, + {"GTK+", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, {0,0,0,0,0,0,0,0,0} }; @@ -214,70 +221,69 @@ load_history(); } Fl_Double_Window* make_settings_window() { - Fl_Double_Window* w; - { Fl_Double_Window* o = settings_window = new Fl_Double_Window(340, 225, "GUI Settings"); - w = o; - { Fl_Choice* o = scheme_choice = new Fl_Choice(116, 10, 115, 25, "Scheme:"); - o->down_box(FL_BORDER_BOX); - o->labelfont(1); - o->callback((Fl_Callback*)scheme_cb); - o->menu(menu_scheme_choice); + { settings_window = new Fl_Double_Window(340, 225, "GUI Settings"); + { scheme_choice = new Fl_Choice(116, 10, 115, 25, "Scheme:"); + scheme_choice->down_box(FL_BORDER_BOX); + scheme_choice->labelfont(1); + scheme_choice->callback((Fl_Callback*)scheme_cb); + scheme_choice->menu(menu_scheme_choice); int s; fluid_prefs.get("scheme", s, 0); scheme_choice->value(s); scheme_cb(0, 0); - } + } // Fl_Choice* scheme_choice { Fl_Group* o = new Fl_Group(116, 45, 215, 100, "Options:\n\n\n\n\n"); o->labelfont(1); o->align(FL_ALIGN_LEFT); - { Fl_Check_Button* o = tooltips_button = new Fl_Check_Button(116, 45, 113, 25, "Show Tooltips"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)cb_tooltips_button); + { tooltips_button = new Fl_Check_Button(116, 45, 113, 25, "Show Tooltips"); + tooltips_button->down_box(FL_DOWN_BOX); + tooltips_button->callback((Fl_Callback*)cb_tooltips_button); int b; fluid_prefs.get("show_tooltips", b, 1); tooltips_button->value(b); Fl_Tooltip::enable(b); - } - { Fl_Check_Button* o = completion_button = new Fl_Check_Button(116, 70, 186, 25, "Show Completion Dialogs"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)cb_completion_button); + } // Fl_Check_Button* tooltips_button + { completion_button = new Fl_Check_Button(116, 70, 186, 25, "Show Completion Dialogs"); + completion_button->down_box(FL_DOWN_BOX); + completion_button->callback((Fl_Callback*)cb_completion_button); int b; fluid_prefs.get("show_completion_dialogs", b, 1); completion_button->value(b); - } - { Fl_Check_Button* o = openlast_button = new Fl_Check_Button(116, 95, 215, 25, "Open Previous File on Startup"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)cb_openlast_button); + } // Fl_Check_Button* completion_button + { openlast_button = new Fl_Check_Button(116, 95, 215, 25, "Open Previous File on Startup"); + openlast_button->down_box(FL_DOWN_BOX); + openlast_button->callback((Fl_Callback*)cb_openlast_button); int b; fluid_prefs.get("open_previous_file", b, 0); openlast_button->value(b); - } - { Fl_Check_Button* o = prevpos_button = new Fl_Check_Button(116, 120, 210, 25, "Remember Window Positions"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)cb_prevpos_button); + } // Fl_Check_Button* openlast_button + { prevpos_button = new Fl_Check_Button(116, 120, 210, 25, "Remember Window Positions"); + prevpos_button->down_box(FL_DOWN_BOX); + prevpos_button->callback((Fl_Callback*)cb_prevpos_button); int b; fluid_prefs.get("prev_window_pos", b, 1); prevpos_button->value(b); - } + } // Fl_Check_Button* prevpos_button o->end(); - } + } // Fl_Group* o { Fl_Button* o = new Fl_Button(266, 190, 64, 25, "Close"); o->tooltip("Close this dialog."); o->callback((Fl_Callback*)cb_Close1); - } - { Fl_Spinner* o = recent_spinner = new Fl_Spinner(116, 155, 40, 25, "# Recent Files:"); - o->labelfont(1); - o->callback((Fl_Callback*)cb_recent_spinner); - o->when(FL_WHEN_CHANGED); + } // Fl_Button* o + { recent_spinner = new Fl_Spinner(116, 155, 40, 25, "# Recent Files:"); + recent_spinner->labelfont(1); + recent_spinner->value(1); + recent_spinner->callback((Fl_Callback*)cb_recent_spinner); + recent_spinner->when(FL_WHEN_CHANGED); int c; fluid_prefs.get("recent_files", c, 5); recent_spinner->maximum(10); recent_spinner->value(c); - } - o->set_non_modal(); - o->end(); - } - return w; + } // Fl_Spinner* recent_spinner + settings_window->set_non_modal(); + settings_window->end(); + } // Fl_Double_Window* settings_window + return settings_window; } Fl_Double_Window *shell_window=(Fl_Double_Window *)0; @@ -321,61 +327,58 @@ static void cb_shell_run_button(Fl_Return_Button*, void*) { } Fl_Double_Window* make_shell_window() { - Fl_Double_Window* w; - { Fl_Double_Window* o = shell_window = new Fl_Double_Window(365, 125, "Shell Command"); - w = o; - { Fl_Input* o = shell_command_input = new Fl_Input(10, 27, 347, 25, "Command:"); - o->labelfont(1); - o->callback((Fl_Callback*)cb_shell_command_input); - o->align(FL_ALIGN_TOP_LEFT); + { shell_window = new Fl_Double_Window(365, 125, "Shell Command"); + { shell_command_input = new Fl_Input(10, 27, 347, 25, "Command:"); + shell_command_input->labelfont(1); + shell_command_input->callback((Fl_Callback*)cb_shell_command_input); + shell_command_input->align(FL_ALIGN_TOP_LEFT); char buf[1024]; fluid_prefs.get("shell_command", buf, "", sizeof(buf)); shell_command_input->value(buf); - } - { Fl_Check_Button* o = shell_writecode_button = new Fl_Check_Button(128, 61, 93, 19, "Write Code"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)cb_shell_writecode_button); + } // Fl_Input* shell_command_input + { shell_writecode_button = new Fl_Check_Button(128, 61, 93, 19, "Write Code"); + shell_writecode_button->down_box(FL_DOWN_BOX); + shell_writecode_button->callback((Fl_Callback*)cb_shell_writecode_button); int b; fluid_prefs.get("shell_writecode", b, 1); shell_writecode_button->value(b); - } - { Fl_Check_Button* o = shell_writemsgs_button = new Fl_Check_Button(231, 61, 126, 19, "Write Messages"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)cb_shell_writemsgs_button); + } // Fl_Check_Button* shell_writecode_button + { shell_writemsgs_button = new Fl_Check_Button(231, 61, 126, 19, "Write Messages"); + shell_writemsgs_button->down_box(FL_DOWN_BOX); + shell_writemsgs_button->callback((Fl_Callback*)cb_shell_writemsgs_button); int b; fluid_prefs.get("shell_writemsgs", b, 0); shell_writemsgs_button->value(b); - } - { Fl_Check_Button* o = shell_savefl_button = new Fl_Check_Button(10, 62, 108, 19, "Save .FL File"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)cb_shell_savefl_button); + } // Fl_Check_Button* shell_writemsgs_button + { shell_savefl_button = new Fl_Check_Button(10, 62, 108, 19, "Save .FL File"); + shell_savefl_button->down_box(FL_DOWN_BOX); + shell_savefl_button->callback((Fl_Callback*)cb_shell_savefl_button); int b; fluid_prefs.get("shell_savefl", b, 1); shell_savefl_button->value(b); - } + } // Fl_Check_Button* shell_savefl_button { Fl_Return_Button* o = new Fl_Return_Button(132, 90, 143, 25, "Run Command"); o->callback((Fl_Callback*)do_shell_command); - } + } // Fl_Return_Button* o { Fl_Button* o = new Fl_Button(285, 90, 72, 25, "Cancel"); o->callback((Fl_Callback*)cb_Cancel); - } - o->end(); - } - { Fl_Double_Window* o = shell_run_window = new Fl_Double_Window(555, 430, "Shell Command Output"); - w = o; - { Fl_Text_Display* o = shell_run_display = new Fl_Text_Display(10, 10, 535, 375); - o->box(FL_DOWN_BOX); - o->textfont(4); - Fl_Group::current()->resizable(o); + } // Fl_Button* o + shell_window->end(); + } // Fl_Double_Window* shell_window + { shell_run_window = new Fl_Double_Window(555, 430, "Shell Command Output"); + { shell_run_display = new Fl_Text_Display(10, 10, 535, 375); + shell_run_display->box(FL_DOWN_BOX); + shell_run_display->textfont(4); + Fl_Group::current()->resizable(shell_run_display); shell_run_buffer = new Fl_Text_Buffer(); shell_run_display->buffer(shell_run_buffer); - } - { Fl_Return_Button* o = shell_run_button = new Fl_Return_Button(468, 395, 77, 25, "Close"); - o->callback((Fl_Callback*)cb_shell_run_button); - } - o->end(); - } - return w; + } // Fl_Text_Display* shell_run_display + { shell_run_button = new Fl_Return_Button(468, 395, 77, 25, "Close"); + shell_run_button->callback((Fl_Callback*)cb_shell_run_button); + } // Fl_Return_Button* shell_run_button + shell_run_window->end(); + } // Fl_Double_Window* shell_run_window + return shell_run_window; } Fl_Double_Window *grid_window=(Fl_Double_Window *)0; @@ -395,112 +398,110 @@ static void cb_Close2(Fl_Button*, void*) { Fl_Round_Button *def_widget_size[6]={(Fl_Round_Button *)0}; Fl_Double_Window* make_layout_window() { - Fl_Double_Window* w; - { Fl_Double_Window* o = grid_window = new Fl_Double_Window(285, 245, "Layout Settings"); - w = o; + { grid_window = new Fl_Double_Window(285, 245, "Layout Settings"); { Fl_Input* o = horizontal_input = new Fl_Input(106, 10, 50, 25, "x"); - o->tooltip("Horizontal grid spacing."); - o->type(2); - o->box(FL_THIN_DOWN_BOX); - o->callback((Fl_Callback*)grid_cb, (void*)(1)); - o->align(FL_ALIGN_RIGHT); + horizontal_input->tooltip("Horizontal grid spacing."); + horizontal_input->type(2); + horizontal_input->box(FL_THIN_DOWN_BOX); + horizontal_input->callback((Fl_Callback*)grid_cb, (void*)(1)); + horizontal_input->align(FL_ALIGN_RIGHT); o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY); - } + } // Fl_Input* horizontal_input { Fl_Input* o = vertical_input = new Fl_Input(166, 10, 50, 25, "pixels"); - o->tooltip("Vertical grid spacing."); - o->type(2); - o->box(FL_THIN_DOWN_BOX); - o->callback((Fl_Callback*)grid_cb, (void*)(2)); - o->align(FL_ALIGN_RIGHT); + vertical_input->tooltip("Vertical grid spacing."); + vertical_input->type(2); + vertical_input->box(FL_THIN_DOWN_BOX); + vertical_input->callback((Fl_Callback*)grid_cb, (void*)(2)); + vertical_input->align(FL_ALIGN_RIGHT); o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY); - } + } // Fl_Input* vertical_input { Fl_Input* o = snap_input = new Fl_Input(106, 45, 50, 25, "pixel snap"); - o->tooltip("Snap to grid within this many pixels."); - o->type(2); - o->box(FL_THIN_DOWN_BOX); - o->callback((Fl_Callback*)grid_cb, (void*)(3)); - o->align(FL_ALIGN_RIGHT); + snap_input->tooltip("Snap to grid within this many pixels."); + snap_input->type(2); + snap_input->box(FL_THIN_DOWN_BOX); + snap_input->callback((Fl_Callback*)grid_cb, (void*)(3)); + snap_input->align(FL_ALIGN_RIGHT); o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY); - } - { Fl_Check_Button* o = guides_toggle = new Fl_Check_Button(106, 80, 110, 25, "Show Guides"); - o->tooltip("Show distance and alignment guides in overlay"); - o->down_box(FL_DOWN_BOX); - o->callback((Fl_Callback*)guides_cb, (void*)(4)); - } + } // Fl_Input* snap_input + { guides_toggle = new Fl_Check_Button(106, 80, 110, 25, "Show Guides"); + guides_toggle->tooltip("Show distance and alignment guides in overlay"); + guides_toggle->down_box(FL_DOWN_BOX); + guides_toggle->callback((Fl_Callback*)guides_cb, (void*)(4)); + } // Fl_Check_Button* guides_toggle { Fl_Button* o = new Fl_Button(215, 210, 60, 25, "Close"); o->tooltip("Close this dialog."); o->callback((Fl_Callback*)cb_Close2); - } + } // Fl_Button* o { Fl_Box* o = new Fl_Box(26, 10, 70, 25, "Grid:"); o->labelfont(1); o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); - } + } // Fl_Box* o { Fl_Box* o = new Fl_Box(-1, 115, 97, 25, "Widget Size:"); o->labelfont(1); o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); - } + } // Fl_Box* o { Fl_Group* o = new Fl_Group(105, 115, 170, 75); - { Fl_Round_Button* o = def_widget_size[0] = new Fl_Round_Button(105, 115, 70, 25); - o->type(102); - o->down_box(FL_ROUND_DOWN_BOX); - o->callback((Fl_Callback*)default_widget_size_cb, (void*)(8)); - } + { def_widget_size[0] = new Fl_Round_Button(105, 115, 70, 25); + def_widget_size[0]->type(102); + def_widget_size[0]->down_box(FL_ROUND_DOWN_BOX); + def_widget_size[0]->callback((Fl_Callback*)default_widget_size_cb, (void*)(8)); + } // Fl_Round_Button* def_widget_size[0] { Fl_Box* o = new Fl_Box(120, 115, 50, 25, "tiny"); o->labelsize(8); o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - } - { Fl_Round_Button* o = def_widget_size[1] = new Fl_Round_Button(180, 115, 70, 25); - o->type(102); - o->down_box(FL_ROUND_DOWN_BOX); - o->callback((Fl_Callback*)default_widget_size_cb, (void*)(11)); - } + } // Fl_Box* o + { def_widget_size[1] = new Fl_Round_Button(180, 115, 70, 25); + def_widget_size[1]->type(102); + def_widget_size[1]->down_box(FL_ROUND_DOWN_BOX); + def_widget_size[1]->callback((Fl_Callback*)default_widget_size_cb, (void*)(11)); + } // Fl_Round_Button* def_widget_size[1] { Fl_Box* o = new Fl_Box(195, 115, 50, 25, "small"); o->labelsize(11); o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - } - { Fl_Round_Button* o = def_widget_size[2] = new Fl_Round_Button(105, 140, 70, 25); - o->type(102); - o->down_box(FL_ROUND_DOWN_BOX); - o->callback((Fl_Callback*)default_widget_size_cb, (void*)(14)); - } + } // Fl_Box* o + { def_widget_size[2] = new Fl_Round_Button(105, 140, 70, 25); + def_widget_size[2]->type(102); + def_widget_size[2]->down_box(FL_ROUND_DOWN_BOX); + def_widget_size[2]->callback((Fl_Callback*)default_widget_size_cb, (void*)(14)); + } // Fl_Round_Button* def_widget_size[2] { Fl_Box* o = new Fl_Box(120, 140, 50, 25, "normal"); o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - } - { Fl_Round_Button* o = def_widget_size[3] = new Fl_Round_Button(180, 140, 90, 25); - o->type(102); - o->down_box(FL_ROUND_DOWN_BOX); - o->callback((Fl_Callback*)default_widget_size_cb, (void*)(18)); - } + } // Fl_Box* o + { def_widget_size[3] = new Fl_Round_Button(180, 140, 90, 25); + def_widget_size[3]->type(102); + def_widget_size[3]->down_box(FL_ROUND_DOWN_BOX); + def_widget_size[3]->callback((Fl_Callback*)default_widget_size_cb, (void*)(18)); + } // Fl_Round_Button* def_widget_size[3] { Fl_Box* o = new Fl_Box(195, 140, 68, 25, "medium"); o->labelsize(18); o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - } - { Fl_Round_Button* o = def_widget_size[4] = new Fl_Round_Button(105, 165, 75, 25); - o->type(102); - o->down_box(FL_ROUND_DOWN_BOX); - o->callback((Fl_Callback*)default_widget_size_cb, (void*)(24)); - } + } // Fl_Box* o + { def_widget_size[4] = new Fl_Round_Button(105, 165, 75, 25); + def_widget_size[4]->type(102); + def_widget_size[4]->down_box(FL_ROUND_DOWN_BOX); + def_widget_size[4]->callback((Fl_Callback*)default_widget_size_cb, (void*)(24)); + } // Fl_Round_Button* def_widget_size[4] { Fl_Box* o = new Fl_Box(120, 165, 64, 25, "large"); o->labelsize(24); o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - } - { Fl_Round_Button* o = def_widget_size[5] = new Fl_Round_Button(180, 165, 95, 25); - o->type(102); - o->down_box(FL_ROUND_DOWN_BOX); - o->callback((Fl_Callback*)default_widget_size_cb, (void*)(32)); - } + } // Fl_Box* o + { def_widget_size[5] = new Fl_Round_Button(180, 165, 95, 25); + def_widget_size[5]->type(102); + def_widget_size[5]->down_box(FL_ROUND_DOWN_BOX); + def_widget_size[5]->callback((Fl_Callback*)default_widget_size_cb, (void*)(32)); + } // Fl_Round_Button* def_widget_size[5] { Fl_Box* o = new Fl_Box(195, 165, 76, 25, "huge"); o->labelsize(32); o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - } + } // Fl_Box* o o->end(); - } - o->set_non_modal(); - o->end(); - } - return w; + } // Fl_Group* o + grid_window->set_non_modal(); + grid_window->end(); + } // Fl_Double_Window* grid_window + return grid_window; } // -// End of "$Id: alignment_panel.cxx 4632 2005-11-03 22:16:52Z mike $". +// End of "$Id: alignment_panel.cxx 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl index 34cfefa..5965bae 100644 --- a/fluid/alignment_panel.fl +++ b/fluid/alignment_panel.fl @@ -1,9 +1,9 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0107 +version 1.0108 header_name {.h} code_name {.cxx} comment {// -// "$Id: alignment_panel.fl 4632 2005-11-03 22:16:52Z mike $" +// "$Id: alignment_panel.fl 5808 2007-05-10 12:06:31Z matt $" // // Setting and shell dialogs for the Fast Light Tool Kit (FLTK). // @@ -44,25 +44,25 @@ Function {make_project_window()} {open } { Fl_Window project_window { label {Project Settings} - xywh {312 395 345 185} type Double + xywh {312 395 358 207} type Double code0 {\#include <FL/Fl_Preferences.H>} code1 {\#include <FL/Fl_Tooltip.H>} modal visible } { Fl_Button {} { label Close callback {project_window->hide();} - tooltip {Close this dialog.} xywh {293 156 42 20} labelsize 11 + tooltip {Close this dialog.} xywh {293 175 52 20} labelsize 11 } Fl_Tabs {} {open - xywh {10 10 325 138} selection_color 4 labelsize 11 + xywh {10 10 335 151} selection_color 12 labelsize 11 } { Fl_Group {} { label Output open - xywh {10 30 325 116} labelsize 11 + xywh {10 30 335 131} labelsize 11 } { Fl_Box {} { label {Use "name.ext" to set name or just ".ext" to set extension.} - xywh {20 40 304 15} labelsize 11 align 148 + xywh {15 40 325 15} labelsize 11 align 144 } Fl_Input header_file_input { label {Header File:} @@ -76,15 +76,20 @@ Function {make_project_window()} {open callback code_input_cb tooltip {The name of the generated code file.} xywh {97 85 227 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 when 1 textfont 4 textsize 11 } - Fl_Light_Button include_H_from_C_button { + Fl_Check_Button include_H_from_C_button { label {Include Header from Code} callback include_H_from_C_button_cb - tooltip {Include the header file from the code file.} xywh {166 110 158 20} value 1 labelsize 11 + tooltip {Include the header file from the code file.} xywh {95 110 145 20} down_box DOWN_BOX labelsize 11 + } + Fl_Check_Button use_FL_COMMAND_button { + label {Generate menu shortcuts using FL_COMMAND} + callback use_FL_COMMAND_button_cb selected + tooltip {Replace FL_CTRL with FL_COMMAND when generating menu shortcut code.} xywh {95 130 245 20} down_box DOWN_BOX labelsize 11 } } Fl_Group {} { label Internationalization open - xywh {10 30 325 116} labelsize 11 hide + xywh {10 30 335 131} labelsize 11 hide } { Fl_Choice i18n_type_chooser { label {Use:} @@ -144,12 +149,12 @@ decl {void scheme_cb(Fl_Choice *, void *);} {public Function {make_settings_window()} {open } { Fl_Window settings_window { - label {GUI Settings} + label {GUI Settings} open xywh {326 145 340 225} type Double non_modal visible } { Fl_Choice scheme_choice { label {Scheme:} - callback scheme_cb + callback scheme_cb open xywh {116 10 115 25} down_box BORDER_BOX labelfont 1 code0 {int s;} code1 {fluid_prefs.get("scheme", s, 0);} @@ -168,6 +173,10 @@ Function {make_settings_window()} {open label Plastic xywh {0 0 35 25} } + MenuItem {} { + label {GTK+} + xywh {10 10 35 25} + } } Fl_Group {} { label {Options: @@ -222,7 +231,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());} label {\# Recent Files:} callback {fluid_prefs.set("recent_files", recent_spinner->value()); load_history();} - xywh {116 155 40 25} labelfont 1 when 1 + xywh {116 155 40 25} labelfont 1 when 1 value 1 code0 {int c;} code1 {fluid_prefs.get("recent_files", c, 5);} code2 {recent_spinner->maximum(10);} @@ -300,7 +309,7 @@ Function {make_shell_window()} {open Function {make_layout_window()} {open } { Fl_Window grid_window { - label {Layout Settings} selected + label {Layout Settings} xywh {676 337 285 245} type Double non_modal visible } { Fl_Input horizontal_input { @@ -406,6 +415,6 @@ Function {make_layout_window()} {open comment { // -// End of "$Id: alignment_panel.fl 4632 2005-11-03 22:16:52Z mike $". +// End of "$Id: alignment_panel.fl 5808 2007-05-10 12:06:31Z matt $". //} {in_source in_header } diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h index c622960..650b5b9 100644 --- a/fluid/alignment_panel.h +++ b/fluid/alignment_panel.h @@ -1,5 +1,5 @@ // -// "$Id: alignment_panel.h 4561 2005-09-09 11:36:36Z matt $" +// "$Id: alignment_panel.h 5808 2007-05-10 12:06:31Z matt $" // // Setting and shell dialogs for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #ifndef alignment_panel_h #define alignment_panel_h @@ -46,9 +46,11 @@ extern void header_input_cb(Fl_Input*, void*); extern Fl_Input *header_file_input; extern void code_input_cb(Fl_Input*, void*); extern Fl_Input *code_file_input; -#include <FL/Fl_Light_Button.H> -extern void include_H_from_C_button_cb(Fl_Light_Button*, void*); -extern Fl_Light_Button *include_H_from_C_button; +#include <FL/Fl_Check_Button.H> +extern void include_H_from_C_button_cb(Fl_Check_Button*, void*); +extern Fl_Check_Button *include_H_from_C_button; +extern void use_FL_COMMAND_button_cb(Fl_Check_Button*, void*); +extern Fl_Check_Button *use_FL_COMMAND_button; #include <FL/Fl_Choice.H> extern void i18n_type_cb(Fl_Choice*, void*); extern Fl_Choice *i18n_type_chooser; @@ -61,12 +63,11 @@ Fl_Double_Window* make_project_window(); extern Fl_Menu_Item menu_i18n_type_chooser[]; extern void i18n_cb(Fl_Choice *,void *); extern Fl_Preferences fluid_prefs; -extern Fl_Text_Buffer *shell_run_buffer; -extern void scheme_cb(Fl_Choice *, void *); +extern Fl_Text_Buffer *shell_run_buffer; +extern void scheme_cb(Fl_Choice *, void *); extern Fl_Double_Window *settings_window; extern void scheme_cb(Fl_Choice*, void*); extern Fl_Choice *scheme_choice; -#include <FL/Fl_Check_Button.H> extern Fl_Check_Button *tooltips_button; extern Fl_Check_Button *completion_button; extern Fl_Check_Button *openlast_button; @@ -101,5 +102,5 @@ Fl_Double_Window* make_layout_window(); #endif // -// End of "$Id: alignment_panel.h 4561 2005-09-09 11:36:36Z matt $". +// End of "$Id: alignment_panel.h 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/code.cxx b/fluid/code.cxx index 0c39071..4f70a69 100644 --- a/fluid/code.cxx +++ b/fluid/code.cxx @@ -1,9 +1,9 @@ // -// "$Id: code.cxx 4630 2005-11-03 20:43:19Z matt $" +// "$Id: code.cxx 5441 2006-09-17 18:34:17Z mike $" // // Code output routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -155,13 +155,16 @@ int write_declare(const char *format, ...) { // silly thing to prevent declaring unused variables: // When this symbol is on, all attempts to write code don't write -// anything, but set a variable if it looks like the varaible "o" is used: +// anything, but set a variable if it looks like the variable "o" is used: int varused_test; int varused; // write an array of C characters (adds a null): void write_cstring(const char *w, int length) { - if (varused_test) return; + if (varused_test) { + varused = 1; + return; + } const char *e = w+length; int linelength = 1; putc('\"', code_file); @@ -228,7 +231,10 @@ void write_cstring(const char *w) {write_cstring(w,strlen(w));} // write an array of C binary data (does not add a null): void write_cdata(const char *s, int length) { - if (varused_test) return; + if (varused_test) { + varused = 1; + return; + } const unsigned char *w = (const unsigned char *)s; const unsigned char *e = w+length; int linelength = 1; @@ -246,7 +252,10 @@ void write_cdata(const char *s, int length) { } void write_c(const char* format,...) { - if (varused_test) {varused = 1; return;} + if (varused_test) { + varused = 1; + return; + } va_list args; va_start(args, format); vfprintf(code_file, format, args); @@ -264,6 +273,7 @@ void write_h(const char* format,...) { #include <FL/filename.H> int write_number; int write_sourceview; +extern Fl_Widget_Class_Type *current_widget_class; // recursively dump code, putting children between the two parts // of the parent code: @@ -305,6 +315,7 @@ static Fl_Type* write_code(Fl_Type* p) { } write_h("};\n"); + current_widget_class = 0L; } else { for (q = p->next; q && q->level > p->level;) q = write_code(q); // write all code that come after the children @@ -574,5 +585,5 @@ void Fl_Type::write_code1() { void Fl_Type::write_code2() {} // -// End of "$Id: code.cxx 4630 2005-11-03 20:43:19Z matt $". +// End of "$Id: code.cxx 5441 2006-09-17 18:34:17Z mike $". // diff --git a/fluid/factory.cxx b/fluid/factory.cxx index 57a68d6..0058209 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -1,5 +1,5 @@ // -// "$Id: factory.cxx 4436 2005-07-20 11:11:51Z matt $" +// "$Id: factory.cxx 5658 2007-02-02 20:09:53Z mike $" // // Widget factory code for the Fast Light Tool Kit (FLTK). // @@ -11,7 +11,7 @@ // to a factory instance for every class (both the ones defined // here and ones in other files) // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -378,8 +378,12 @@ int Fl_Counter_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) { //////////////////////////////////////////////////////////////// #include <FL/Fl_Spinner.H> +static Fl_Menu_Item spinner_type_menu[] = { + {"Integer",0,0,(void*)FL_INT_INPUT}, + {"Float", 0,0,(void*)FL_FLOAT_INPUT}, + {0}}; class Fl_Spinner_Type : public Fl_Widget_Type { - Fl_Menu_Item *subtypes() {return 0;} + Fl_Menu_Item *subtypes() {return spinner_type_menu;} int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c); int pixmapID() { return 47; } public: @@ -394,6 +398,7 @@ public: if (w < 40) w = 40 ; } virtual const char *type_name() {return "Fl_Spinner";} + int is_spinner() const { return 1; } Fl_Widget *widget(int x,int y,int w,int h) { return new Fl_Spinner(x,y,w,h,"spinner:");} Fl_Widget_Type *_make() {return new Fl_Spinner_Type();} @@ -619,8 +624,10 @@ public: virtual const char *type_name() {return "Fl_Help_View";} Fl_Widget *widget(int x,int y,int w,int h) { Fl_Help_View *myo = new Fl_Help_View(x,y,w,h); - myo->value("<HTML><BODY><H1>Fl_Help_View Widget</H1>" - "<P>This is a Fl_Help_View widget.</P></BODY></HTML>"); + if (!compile_only) { + myo->value("<HTML><BODY><H1>Fl_Help_View Widget</H1>" + "<P>This is a Fl_Help_View widget.</P></BODY></HTML>"); + } return myo;} Fl_Widget_Type *_make() {return new Fl_Help_View_Type();} int pixmapID() { return 35; } @@ -724,6 +731,7 @@ static Fl_Menu_Item scrollbar_type_menu[] = { {0}}; class Fl_Scrollbar_Type : public Fl_Slider_Type { Fl_Menu_Item *subtypes() {return scrollbar_type_menu;} + int is_valuator() const {return 3;} public: virtual const char *type_name() {return "Fl_Scrollbar";} Fl_Widget *widget(int x,int y,int w,int h) { @@ -1198,5 +1206,5 @@ int lookup_symbol(const char *name, int &v, int numberok) { } // -// End of "$Id: factory.cxx 4436 2005-07-20 11:11:51Z matt $". +// End of "$Id: factory.cxx 5658 2007-02-02 20:09:53Z mike $". // diff --git a/fluid/file.cxx b/fluid/file.cxx index dc49811..95f2f42 100644 --- a/fluid/file.cxx +++ b/fluid/file.cxx @@ -1,5 +1,5 @@ // -// "$Id: file.cxx 4288 2005-04-16 00:13:17Z mike $" +// "$Id: file.cxx 5808 2007-05-10 12:06:31Z matt $" // // Fluid file routines for the Fast Light Tool Kit (FLTK). // @@ -8,7 +8,7 @@ // They are somewhat similar to tcl, using matching { and } // to quote strings. // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -101,7 +101,7 @@ void write_string(const char *format, ...) { if (needspace) fputc(' ',fout); vfprintf(fout, format, args); va_end(args); - needspace = !isspace(format[strlen(format)-1]); + needspace = !isspace(format[strlen(format)-1] & 255); } // start a new line and indent it for a given nesting level: @@ -238,7 +238,7 @@ const char *read_word(int wantbrace) { // skip all the whitespace before it: for (;;) { x = getc(fin); - if (x < 0) { // eof + if (x < 0 && feof(fin)) { // eof return 0; } else if (x == '#') { // comment do x = getc(fin); while (x >= 0 && x != '\n'); @@ -246,7 +246,7 @@ const char *read_word(int wantbrace) { continue; } else if (x == '\n') { lineno++; - } else if (!isspace(x)) { + } else if (!isspace(x & 255)) { break; } } @@ -287,7 +287,7 @@ const char *read_word(int wantbrace) { int length = 0; for (;;) { if (x == '\\') {x = read_quoted(); if (x<0) continue;} - else if (x<0 || isspace(x) || x=='{' || x=='}' || x=='#') break; + else if (x<0 || isspace(x & 255) || x=='{' || x=='}' || x=='#') break; buffer[length++] = x; expand_buffer(length); x = getc(fin); @@ -323,6 +323,8 @@ int write_file(const char *filename, int selected_only) { "version %.4f",FL_VERSION); if(!include_H_from_C) write_string("\ndo_not_include_H_from_C"); + if(use_FL_COMMAND) + write_string("\nuse_FL_COMMAND"); if (i18n_type) { write_string("\ni18n_type %d", i18n_type); write_string("\ni18n_include %s", i18n_include); @@ -404,6 +406,10 @@ static void read_children(Fl_Type *p, int paste) { include_H_from_C=0; goto CONTINUE; } + if (!strcmp(c,"use_FL_COMMAND")) { + use_FL_COMMAND=1; + goto CONTINUE; + } if (!strcmp(c,"i18n_type")) { i18n_type = atoi(read_word()); goto CONTINUE; @@ -504,6 +510,7 @@ int read_file(const char *filename, int merge) { if (o->is_menu_button()) o->add_child(0,0); for (o = Fl_Type::first; o; o = o->next) if (o->selected) {Fl_Type::current = o; break;} + selection_changed(Fl_Type::current); return close_read(); } @@ -517,9 +524,9 @@ int read_fdesign_line(const char*& name, const char*& value) { // find a colon: for (;;) { x = getc(fin); - if (x < 0) return 0; + if (x < 0 && feof(fin)) return 0; if (x == '\n') {length = 0; continue;} // no colon this line... - if (!isspace(x)) { + if (!isspace(x & 255)) { buffer[length++] = x; expand_buffer(length); } @@ -531,7 +538,7 @@ int read_fdesign_line(const char*& name, const char*& value) { // skip to start of value: for (;;) { x = getc(fin); - if (x < 0 || x == '\n' || !isspace(x)) break; + if ((x < 0 && feof(fin)) || x == '\n' || !isspace(x & 255)) break; } // read the value: @@ -639,5 +646,5 @@ void read_fdesign() { } // -// End of "$Id: file.cxx 4288 2005-04-16 00:13:17Z mike $". +// End of "$Id: file.cxx 5808 2007-05-10 12:06:31Z matt $". // diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index d849c6e..628b343 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,9 +1,9 @@ // -// "$Id: fluid.cxx 4660 2005-11-27 14:45:48Z mike $" +// "$Id: fluid.cxx 5701 2007-02-20 18:43:10Z mike $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2007 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -59,11 +59,13 @@ # include <io.h> # include <commdlg.h> # include <FL/x.H> +# ifndef __WATCOMC__ // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs // on Windows, which is supposed to be POSIX compliant... -# define access _access -# define chdir _chdir -# define getcwd _getcwd +# define access _access +# define chdir _chdir +# define getcwd _getcwd +# endif // !__WATCOMC__ #else # include <unistd.h> #endif @@ -1567,48 +1569,48 @@ void toggle_sourceview_cb(Fl_Double_Window *, void *); Fl_Menu_Item Main_Menu[] = { {"&File",0,0,0,FL_SUBMENU}, - {"&New...", FL_CTRL+'n', new_cb, 0}, - {"&Open...", FL_CTRL+'o', open_cb, 0}, - {"&Insert...", FL_CTRL+'i', open_cb, (void*)1, FL_MENU_DIVIDER}, + {"&New...", FL_COMMAND+'n', new_cb, 0}, + {"&Open...", FL_COMMAND+'o', open_cb, 0}, + {"&Insert...", FL_COMMAND+'i', open_cb, (void*)1, FL_MENU_DIVIDER}, #define SAVE_ITEM 4 - {"&Save", FL_CTRL+'s', save_cb, 0}, - {"Save &As...", FL_CTRL+FL_SHIFT+'s', save_cb, (void*)1}, + {"&Save", FL_COMMAND+'s', save_cb, 0}, + {"Save &As...", FL_COMMAND+FL_SHIFT+'s', save_cb, (void*)1}, {"Sa&ve A Copy...", 0, save_cb, (void*)2}, {"Save &Template...", 0, save_template_cb}, {"&Revert...", 0, revert_cb, 0, FL_MENU_DIVIDER}, - {"&Print...", FL_CTRL+'p', print_menu_cb}, - {"Write &Code...", FL_CTRL+FL_SHIFT+'c', write_cb, 0}, - {"&Write Strings...", FL_CTRL+FL_SHIFT+'w', write_strings_cb, 0, FL_MENU_DIVIDER}, + {"&Print...", FL_COMMAND+'p', print_menu_cb}, + {"Write &Code...", FL_COMMAND+FL_SHIFT+'c', write_cb, 0}, + {"&Write Strings...", FL_COMMAND+FL_SHIFT+'w', write_strings_cb, 0, FL_MENU_DIVIDER}, #define HISTORY_ITEM 12 - {relative_history[0], FL_CTRL+'0', open_history_cb, absolute_history[0]}, - {relative_history[1], FL_CTRL+'1', open_history_cb, absolute_history[1]}, - {relative_history[2], FL_CTRL+'2', open_history_cb, absolute_history[2]}, - {relative_history[3], FL_CTRL+'3', open_history_cb, absolute_history[3]}, - {relative_history[4], FL_CTRL+'4', open_history_cb, absolute_history[4]}, - {relative_history[5], FL_CTRL+'5', open_history_cb, absolute_history[5]}, - {relative_history[6], FL_CTRL+'6', open_history_cb, absolute_history[6]}, - {relative_history[7], FL_CTRL+'7', open_history_cb, absolute_history[7]}, - {relative_history[8], FL_CTRL+'8', open_history_cb, absolute_history[8]}, - {relative_history[9], FL_CTRL+'9', open_history_cb, absolute_history[9], FL_MENU_DIVIDER}, - {"&Quit", FL_CTRL+'q', exit_cb}, + {relative_history[0], FL_COMMAND+'0', open_history_cb, absolute_history[0]}, + {relative_history[1], FL_COMMAND+'1', open_history_cb, absolute_history[1]}, + {relative_history[2], FL_COMMAND+'2', open_history_cb, absolute_history[2]}, + {relative_history[3], FL_COMMAND+'3', open_history_cb, absolute_history[3]}, + {relative_history[4], FL_COMMAND+'4', open_history_cb, absolute_history[4]}, + {relative_history[5], FL_COMMAND+'5', open_history_cb, absolute_history[5]}, + {relative_history[6], FL_COMMAND+'6', open_history_cb, absolute_history[6]}, + {relative_history[7], FL_COMMAND+'7', open_history_cb, absolute_history[7]}, + {relative_history[8], FL_COMMAND+'8', open_history_cb, absolute_history[8]}, + {relative_history[9], FL_COMMAND+'9', open_history_cb, absolute_history[9], FL_MENU_DIVIDER}, + {"&Quit", FL_COMMAND+'q', exit_cb}, {0}, {"&Edit",0,0,0,FL_SUBMENU}, - {"&Undo", FL_CTRL+'z', undo_cb}, - {"&Redo", FL_CTRL+FL_SHIFT+'z', redo_cb, 0, FL_MENU_DIVIDER}, - {"C&ut", FL_CTRL+'x', cut_cb}, - {"&Copy", FL_CTRL+'c', copy_cb}, - {"&Paste", FL_CTRL+'v', paste_cb}, - {"Dup&licate", FL_CTRL+'u', duplicate_cb}, + {"&Undo", FL_COMMAND+'z', undo_cb}, + {"&Redo", FL_COMMAND+FL_SHIFT+'z', redo_cb, 0, FL_MENU_DIVIDER}, + {"C&ut", FL_COMMAND+'x', cut_cb}, + {"&Copy", FL_COMMAND+'c', copy_cb}, + {"&Paste", FL_COMMAND+'v', paste_cb}, + {"Dup&licate", FL_COMMAND+'u', duplicate_cb}, {"&Delete", FL_Delete, delete_cb, 0, FL_MENU_DIVIDER}, - {"Select &All", FL_CTRL+'a', select_all_cb}, - {"Select &None", FL_CTRL+FL_SHIFT+'a', select_none_cb, 0, FL_MENU_DIVIDER}, + {"Select &All", FL_COMMAND+'a', select_all_cb}, + {"Select &None", FL_COMMAND+FL_SHIFT+'a', select_none_cb, 0, FL_MENU_DIVIDER}, {"Pr&operties...", FL_F+1, openwidget_cb}, {"&Sort",0,sort_cb}, {"&Earlier", FL_F+2, earlier_cb}, {"&Later", FL_F+3, later_cb}, {"&Group", FL_F+7, group_cb}, {"Ung&roup", FL_F+8, ungroup_cb,0, FL_MENU_DIVIDER}, - {"Hide O&verlays",FL_CTRL+FL_SHIFT+'o',toggle_overlays}, + {"Hide O&verlays",FL_COMMAND+FL_SHIFT+'o',toggle_overlays}, #define WIDGETBIN_ITEM 41 {"Show Widget &Bin...",FL_ALT+'b',toggle_widgetbin_cb}, #define SOURCEVIEW_ITEM 42 @@ -1647,7 +1649,7 @@ Fl_Menu_Item Main_Menu[] = { {"&Large",FL_ALT+'5',(Fl_Callback *)widget_size_cb,(void*)24,0,FL_NORMAL_LABEL,FL_HELVETICA,24}, {"&Huge",FL_ALT+'6',(Fl_Callback *)widget_size_cb,(void*)32,0,FL_NORMAL_LABEL,FL_HELVETICA,32}, {0}, - {"&Grid and Size Settings...",FL_CTRL+'g',show_grid_cb}, + {"&Grid and Size Settings...",FL_COMMAND+'g',show_grid_cb}, {0}, {"&Shell",0,0,0,FL_SUBMENU}, {"Execute &Command...",FL_ALT+'x',(Fl_Callback *)show_shell_window}, @@ -1682,6 +1684,9 @@ void scheme_cb(Fl_Choice *, void *) { case 2 : // Plastic Fl::scheme("plastic"); break; + case 3 : // GTK+ + Fl::scheme("gtk+"); + break; } fluid_prefs.set("scheme", scheme_choice->value()); @@ -2236,5 +2241,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx 4660 2005-11-27 14:45:48Z mike $". +// End of "$Id: fluid.cxx 5701 2007-02-20 18:43:10Z mike $". // diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx index 977822a..7df9c95 100644 --- a/fluid/function_panel.cxx +++ b/fluid/function_panel.cxx @@ -1,5 +1,5 @@ // -// "$Id: function_panel.cxx 4632 2005-11-03 22:16:52Z mike $" +// "$Id: function_panel.cxx 5440 2006-09-17 18:31:35Z matt $" // // Code dialogs for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #include "function_panel.h" #include <FL/Fl_Pixmap.H> @@ -50,64 +50,62 @@ Fl_Return_Button *f_panel_ok=(Fl_Return_Button *)0; Fl_Button *f_panel_cancel=(Fl_Button *)0; Fl_Double_Window* make_function_panel() { - Fl_Double_Window* w; { Fl_Double_Window* o = function_panel = new Fl_Double_Window(290, 150, "Function/Method Properties"); - w = o; { Fl_Group* o = new Fl_Group(10, 10, 270, 20); - { Fl_Light_Button* o = f_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); - o->tooltip("Make the function or method publicly accessible."); - o->labelsize(11); - o->when(FL_WHEN_NEVER); - } - { Fl_Light_Button* o = f_c_button = new Fl_Light_Button(80, 10, 80, 20, "C declaration"); - o->tooltip("Declare with a C interface instead of C++."); - o->labelsize(11); - } + { f_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); + f_public_button->tooltip("Make the function or method publicly accessible."); + f_public_button->labelsize(11); + f_public_button->when(FL_WHEN_NEVER); + } // Fl_Light_Button* f_public_button + { f_c_button = new Fl_Light_Button(80, 10, 80, 20, "C declaration"); + f_c_button->tooltip("Declare with a C interface instead of C++."); + f_c_button->labelsize(11); + } // Fl_Light_Button* f_c_button { Fl_Box* o = new Fl_Box(170, 10, 110, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Input* o = f_name_input = new Fl_Input(10, 50, 270, 20, "Name(args): (blank for main())"); - o->tooltip("The name of the function or method."); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - Fl_Group::current()->resizable(o); - } - { Fl_Input* o = f_return_type_input = new Fl_Input(10, 90, 270, 20, "Return Type: (blank to return outermost widget)"); - o->tooltip("The return type of the function or method."); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - } + } // Fl_Group* o + { f_name_input = new Fl_Input(10, 50, 270, 20, "Name(args): (blank for main())"); + f_name_input->tooltip("The name of the function or method."); + f_name_input->labelfont(1); + f_name_input->labelsize(11); + f_name_input->textfont(4); + f_name_input->textsize(11); + f_name_input->align(FL_ALIGN_TOP_LEFT); + f_name_input->when(FL_WHEN_NEVER); + Fl_Group::current()->resizable(f_name_input); + } // Fl_Input* f_name_input + { f_return_type_input = new Fl_Input(10, 90, 270, 20, "Return Type: (blank to return outermost widget)"); + f_return_type_input->tooltip("The return type of the function or method."); + f_return_type_input->labelfont(1); + f_return_type_input->labelsize(11); + f_return_type_input->textfont(4); + f_return_type_input->textsize(11); + f_return_type_input->align(FL_ALIGN_TOP_LEFT); + f_return_type_input->when(FL_WHEN_NEVER); + } // Fl_Input* f_return_type_input { Fl_Group* o = new Fl_Group(10, 120, 270, 20); - { Fl_Return_Button* o = f_panel_ok = new Fl_Return_Button(170, 120, 50, 20, "OK"); - o->tooltip("Apply the changes."); - o->labelsize(11); - w->hotspot(o); - } - { Fl_Button* o = f_panel_cancel = new Fl_Button(230, 120, 50, 20, "Cancel"); - o->tooltip("Cancel the changes."); - o->shortcut(0xff1b); - o->labelsize(11); - } + { f_panel_ok = new Fl_Return_Button(170, 120, 50, 20, "OK"); + f_panel_ok->tooltip("Apply the changes."); + f_panel_ok->labelsize(11); + f_panel_ok->window()->hotspot(f_panel_ok); + } // Fl_Return_Button* f_panel_ok + { f_panel_cancel = new Fl_Button(230, 120, 50, 20, "Cancel"); + f_panel_cancel->tooltip("Cancel the changes."); + f_panel_cancel->shortcut(0xff1b); + f_panel_cancel->labelsize(11); + } // Fl_Button* f_panel_cancel { Fl_Box* o = new Fl_Box(10, 120, 150, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o o->size_range(o->w(), o->h(), Fl::w(), o->h()); - o->set_modal(); - o->end(); - } - return w; + function_panel->set_modal(); + function_panel->end(); + } // Fl_Double_Window* function_panel + return function_panel; } Fl_Double_Window *code_panel=(Fl_Double_Window *)0; @@ -119,46 +117,44 @@ Fl_Return_Button *code_panel_ok=(Fl_Return_Button *)0; Fl_Button *code_panel_cancel=(Fl_Button *)0; Fl_Double_Window* make_code_panel() { - Fl_Double_Window* w; { Fl_Double_Window* o = code_panel = new Fl_Double_Window(540, 180, "Code Properties"); - w = o; - o->labelsize(11); + code_panel->labelsize(11); { CodeEditor* o = code_input = new CodeEditor(10, 10, 520, 130); - o->box(FL_DOWN_BOX); - o->color(FL_BACKGROUND2_COLOR); - o->selection_color(FL_SELECTION_COLOR); - o->labeltype(FL_NORMAL_LABEL); - o->labelfont(0); - o->labelsize(11); - o->labelcolor(FL_FOREGROUND_COLOR); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP); - o->when(FL_WHEN_RELEASE); - Fl_Group::current()->resizable(o); + code_input->box(FL_DOWN_BOX); + code_input->color(FL_BACKGROUND2_COLOR); + code_input->selection_color(FL_SELECTION_COLOR); + code_input->labeltype(FL_NORMAL_LABEL); + code_input->labelfont(0); + code_input->labelsize(11); + code_input->labelcolor(FL_FOREGROUND_COLOR); + code_input->textfont(4); + code_input->textsize(11); + code_input->align(FL_ALIGN_TOP); + code_input->when(FL_WHEN_RELEASE); + Fl_Group::current()->resizable(code_input); o->when(FL_WHEN_ENTER_KEY_CHANGED|FL_WHEN_RELEASE); - } + } // CodeEditor* code_input { Fl_Group* o = new Fl_Group(10, 150, 520, 20); o->labelsize(11); - { Fl_Return_Button* o = code_panel_ok = new Fl_Return_Button(400, 150, 60, 20, "OK"); - o->labelsize(11); - w->hotspot(o); - } - { Fl_Button* o = code_panel_cancel = new Fl_Button(470, 150, 60, 20, "Cancel"); - o->shortcut(0xff1b); - o->labelsize(11); - } + { code_panel_ok = new Fl_Return_Button(400, 150, 60, 20, "OK"); + code_panel_ok->labelsize(11); + code_panel_ok->window()->hotspot(code_panel_ok); + } // Fl_Return_Button* code_panel_ok + { code_panel_cancel = new Fl_Button(470, 150, 60, 20, "Cancel"); + code_panel_cancel->shortcut(0xff1b); + code_panel_cancel->labelsize(11); + } // Fl_Button* code_panel_cancel { Fl_Box* o = new Fl_Box(10, 150, 380, 20); o->labelsize(11); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o o->size_range(200, 150); - o->set_modal(); - o->end(); - } - return w; + code_panel->set_modal(); + code_panel->end(); + } // Fl_Double_Window* code_panel + return code_panel; } Fl_Double_Window *codeblock_panel=(Fl_Double_Window *)0; @@ -172,46 +168,44 @@ Fl_Return_Button *codeblock_panel_ok=(Fl_Return_Button *)0; Fl_Button *codeblock_panel_cancel=(Fl_Button *)0; Fl_Double_Window* make_codeblock_panel() { - Fl_Double_Window* w; { Fl_Double_Window* o = codeblock_panel = new Fl_Double_Window(300, 115, "Code Block Properties"); - w = o; - o->labelsize(11); - { Fl_Input* o = code_before_input = new Fl_Input(10, 15, 280, 20, "Conditional code block"); - o->tooltip("#ifdef or similar conditional code block."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - } - { Fl_Input* o = code_after_input = new Fl_Input(10, 55, 280, 20, "\"{...child code...}\" is inserted here"); - o->tooltip("#endif or similar conditional code block."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - Fl_Group::current()->resizable(o); - } + codeblock_panel->labelsize(11); + { code_before_input = new Fl_Input(10, 15, 280, 20, "Conditional code block"); + code_before_input->tooltip("#ifdef or similar conditional code block."); + code_before_input->labelsize(11); + code_before_input->textfont(4); + code_before_input->textsize(11); + code_before_input->align(FL_ALIGN_TOP_LEFT); + code_before_input->when(FL_WHEN_NEVER); + } // Fl_Input* code_before_input + { code_after_input = new Fl_Input(10, 55, 280, 20, "\"{...child code...}\" is inserted here"); + code_after_input->tooltip("#endif or similar conditional code block."); + code_after_input->labelsize(11); + code_after_input->textfont(4); + code_after_input->textsize(11); + code_after_input->align(FL_ALIGN_TOP_LEFT); + code_after_input->when(FL_WHEN_NEVER); + Fl_Group::current()->resizable(code_after_input); + } // Fl_Input* code_after_input { Fl_Group* o = new Fl_Group(10, 85, 280, 20); - { Fl_Return_Button* o = codeblock_panel_ok = new Fl_Return_Button(160, 85, 60, 20, "OK"); - o->labelsize(11); - w->hotspot(o); - } - { Fl_Button* o = codeblock_panel_cancel = new Fl_Button(230, 85, 60, 20, "Cancel"); - o->shortcut(0xff1b); - o->labelsize(11); - } + { codeblock_panel_ok = new Fl_Return_Button(160, 85, 60, 20, "OK"); + codeblock_panel_ok->labelsize(11); + codeblock_panel_ok->window()->hotspot(codeblock_panel_ok); + } // Fl_Return_Button* codeblock_panel_ok + { codeblock_panel_cancel = new Fl_Button(230, 85, 60, 20, "Cancel"); + codeblock_panel_cancel->shortcut(0xff1b); + codeblock_panel_cancel->labelsize(11); + } // Fl_Button* codeblock_panel_cancel { Fl_Box* o = new Fl_Box(10, 85, 140, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o o->size_range(o->w(), o->h(), Fl::w(), o->h()); - o->set_modal(); - o->end(); - } - return w; + codeblock_panel->set_modal(); + codeblock_panel->end(); + } // Fl_Double_Window* codeblock_panel + return codeblock_panel; } Fl_Double_Window *declblock_panel=(Fl_Double_Window *)0; @@ -227,63 +221,63 @@ Fl_Button *declblock_panel_cancel=(Fl_Button *)0; Fl_Light_Button *declblock_public_button=(Fl_Light_Button *)0; Fl_Double_Window* make_declblock_panel() { - Fl_Double_Window* w; { Fl_Double_Window* o = declblock_panel = new Fl_Double_Window(300, 135, "Declaration Block Properties"); - w = o; - o->labelsize(11); - { Fl_Input* o = decl_before_input = new Fl_Input(10, 40, 280, 20); - o->tooltip("#ifdef or similar conditional declaration block."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - Fl_Group::current()->resizable(o); - } - { Fl_Input* o = decl_after_input = new Fl_Input(10, 75, 280, 20, "\"\\n...child code...\\n\" is inserted here"); - o->tooltip("#endif or similar declaration code block."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - } + declblock_panel->labelsize(11); + { decl_before_input = new Fl_Input(10, 40, 280, 20); + decl_before_input->tooltip("#ifdef or similar conditional declaration block."); + decl_before_input->labelsize(11); + decl_before_input->textfont(4); + decl_before_input->textsize(11); + decl_before_input->align(FL_ALIGN_TOP_LEFT); + decl_before_input->when(FL_WHEN_NEVER); + Fl_Group::current()->resizable(decl_before_input); + } // Fl_Input* decl_before_input + { decl_after_input = new Fl_Input(10, 75, 280, 20, "\"\\n...child code...\\n\" is inserted here"); + decl_after_input->tooltip("#endif or similar declaration code block."); + decl_after_input->labelsize(11); + decl_after_input->textfont(4); + decl_after_input->textsize(11); + decl_after_input->align(FL_ALIGN_TOP_LEFT); + decl_after_input->when(FL_WHEN_NEVER); + } // Fl_Input* decl_after_input { Fl_Group* o = new Fl_Group(10, 105, 280, 20); - { Fl_Return_Button* o = declblock_panel_ok = new Fl_Return_Button(160, 105, 60, 20, "OK"); - o->labelsize(11); - w->hotspot(o); - } - { Fl_Button* o = declblock_panel_cancel = new Fl_Button(230, 105, 60, 20, "Cancel"); - o->shortcut(0xff1b); - o->labelsize(11); - } + { declblock_panel_ok = new Fl_Return_Button(160, 105, 60, 20, "OK"); + declblock_panel_ok->labelsize(11); + declblock_panel_ok->window()->hotspot(declblock_panel_ok); + } // Fl_Return_Button* declblock_panel_ok + { declblock_panel_cancel = new Fl_Button(230, 105, 60, 20, "Cancel"); + declblock_panel_cancel->shortcut(0xff1b); + declblock_panel_cancel->labelsize(11); + } // Fl_Button* declblock_panel_cancel { Fl_Box* o = new Fl_Box(10, 105, 140, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o { Fl_Group* o = new Fl_Group(10, 10, 280, 20); - { Fl_Light_Button* o = declblock_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); - o->tooltip("Make the declaration publicly accessible."); - o->labelsize(11); - o->when(FL_WHEN_NEVER); - } + { declblock_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); + declblock_public_button->tooltip("Make the declaration publicly accessible."); + declblock_public_button->labelsize(11); + declblock_public_button->when(FL_WHEN_NEVER); + } // Fl_Light_Button* declblock_public_button { Fl_Box* o = new Fl_Box(80, 10, 210, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o o->size_range(o->w(), o->h(), Fl::w(), o->h()); - o->set_modal(); - o->end(); - } - return w; + declblock_panel->set_modal(); + declblock_panel->end(); + } // Fl_Double_Window* declblock_panel + return declblock_panel; } Fl_Double_Window *decl_panel=(Fl_Double_Window *)0; Fl_Light_Button *decl_public_button=(Fl_Light_Button *)0; +Fl_Light_Button *decl_static_button=(Fl_Light_Button *)0; + Fl_Input *decl_input=(Fl_Input *)0; Fl_Return_Button *decl_panel_ok=(Fl_Return_Button *)0; @@ -291,49 +285,54 @@ Fl_Return_Button *decl_panel_ok=(Fl_Return_Button *)0; Fl_Button *decl_panel_cancel=(Fl_Button *)0; Fl_Double_Window* make_decl_panel() { - Fl_Double_Window* w; { Fl_Double_Window* o = decl_panel = new Fl_Double_Window(290, 150, "Declaration Properties"); - w = o; + decl_panel->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE); { Fl_Group* o = new Fl_Group(10, 10, 270, 20); - { Fl_Light_Button* o = decl_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); - o->tooltip("Make the declaration publicly accessible."); - o->labelsize(11); - o->when(FL_WHEN_NEVER); - } - { Fl_Box* o = new Fl_Box(80, 10, 200, 20); + { decl_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); + decl_public_button->tooltip("Make the declaration publicly accessible."); + decl_public_button->labelsize(11); + decl_public_button->when(FL_WHEN_NEVER); + } // Fl_Light_Button* decl_public_button + { decl_static_button = new Fl_Light_Button(80, 10, 60, 20, "static"); + decl_static_button->tooltip("Prepend \'static\' to private declarations in the source code, or \'extern\' \ +to public declarations in the header file."); + decl_static_button->labelsize(11); + decl_static_button->when(FL_WHEN_NEVER); + } // Fl_Light_Button* decl_static_button + { Fl_Box* o = new Fl_Box(150, 10, 130, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Input* o = decl_input = new Fl_Input(10, 40, 270, 20, "Can be any declaration, like \"int x;\", an external symbol like \"extern int\ + } // Fl_Group* o + { decl_input = new Fl_Input(10, 40, 270, 20, "Can be any declaration, like \"int x;\", an external symbol like \"extern int\ foo();\", a #directive like \"#include <foo.h>\", a comment like \"//foo\" or\ \"/*foo*/\", or typedef like \"typedef char byte;\" or \"using std::list;\"."); - o->tooltip("Declaration text."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(134); - o->when(FL_WHEN_NEVER); - Fl_Group::current()->resizable(o); - } + decl_input->tooltip("Declaration text."); + decl_input->labelsize(11); + decl_input->textfont(4); + decl_input->textsize(11); + decl_input->align(134); + decl_input->when(FL_WHEN_NEVER); + Fl_Group::current()->resizable(decl_input); + } // Fl_Input* decl_input { Fl_Group* o = new Fl_Group(10, 120, 270, 20); - { Fl_Return_Button* o = decl_panel_ok = new Fl_Return_Button(150, 120, 60, 20, "OK"); - o->labelsize(11); - w->hotspot(o); - } - { Fl_Button* o = decl_panel_cancel = new Fl_Button(220, 120, 60, 20, "Cancel"); - o->shortcut(0xff1b); - o->labelsize(11); - } + { decl_panel_ok = new Fl_Return_Button(150, 120, 60, 20, "OK"); + decl_panel_ok->labelsize(11); + decl_panel_ok->window()->hotspot(decl_panel_ok); + } // Fl_Return_Button* decl_panel_ok + { decl_panel_cancel = new Fl_Button(220, 120, 60, 20, "Cancel"); + decl_panel_cancel->shortcut(0xff1b); + decl_panel_cancel->labelsize(11); + } // Fl_Button* decl_panel_cancel { Fl_Box* o = new Fl_Box(10, 120, 130, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o o->size_range(o->w(), o->h(), Fl::w(), o->h()); - o->end(); - } - return w; + decl_panel->end(); + } // Fl_Double_Window* decl_panel + return decl_panel; } Fl_Double_Window *class_panel=(Fl_Double_Window *)0; @@ -349,59 +348,57 @@ Fl_Return_Button *c_panel_ok=(Fl_Return_Button *)0; Fl_Button *c_panel_cancel=(Fl_Button *)0; Fl_Double_Window* make_class_panel() { - Fl_Double_Window* w; { Fl_Double_Window* o = class_panel = new Fl_Double_Window(300, 140, "Class Properties"); - w = o; - o->labelsize(11); + class_panel->labelsize(11); { Fl_Group* o = new Fl_Group(10, 10, 280, 20); - { Fl_Light_Button* o = c_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); - o->tooltip("Make the class publicly accessible."); - o->labelsize(11); - o->when(FL_WHEN_NEVER); - } + { c_public_button = new Fl_Light_Button(10, 10, 60, 20, "public"); + c_public_button->tooltip("Make the class publicly accessible."); + c_public_button->labelsize(11); + c_public_button->when(FL_WHEN_NEVER); + } // Fl_Light_Button* c_public_button { Fl_Box* o = new Fl_Box(80, 10, 210, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Input* o = c_name_input = new Fl_Input(10, 45, 280, 20, "Name:"); - o->tooltip("Name of class."); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - Fl_Group::current()->resizable(o); - } - { Fl_Input* o = c_subclass_input = new Fl_Input(10, 80, 280, 20, "Subclass of (text between : and {)"); - o->tooltip("Name of subclass."); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP_LEFT); - o->when(FL_WHEN_NEVER); - } + } // Fl_Group* o + { c_name_input = new Fl_Input(10, 45, 280, 20, "Name:"); + c_name_input->tooltip("Name of class."); + c_name_input->labelfont(1); + c_name_input->labelsize(11); + c_name_input->textfont(4); + c_name_input->textsize(11); + c_name_input->align(FL_ALIGN_TOP_LEFT); + c_name_input->when(FL_WHEN_NEVER); + Fl_Group::current()->resizable(c_name_input); + } // Fl_Input* c_name_input + { c_subclass_input = new Fl_Input(10, 80, 280, 20, "Subclass of (text between : and {)"); + c_subclass_input->tooltip("Name of subclass."); + c_subclass_input->labelfont(1); + c_subclass_input->labelsize(11); + c_subclass_input->textfont(4); + c_subclass_input->textsize(11); + c_subclass_input->align(FL_ALIGN_TOP_LEFT); + c_subclass_input->when(FL_WHEN_NEVER); + } // Fl_Input* c_subclass_input { Fl_Group* o = new Fl_Group(10, 110, 280, 20); - { Fl_Return_Button* o = c_panel_ok = new Fl_Return_Button(160, 110, 60, 20, "OK"); - o->labelsize(11); - w->hotspot(o); - } - { Fl_Button* o = c_panel_cancel = new Fl_Button(230, 110, 60, 20, "Cancel"); - o->shortcut(0xff1b); - o->labelsize(11); - } + { c_panel_ok = new Fl_Return_Button(160, 110, 60, 20, "OK"); + c_panel_ok->labelsize(11); + c_panel_ok->window()->hotspot(c_panel_ok); + } // Fl_Return_Button* c_panel_ok + { c_panel_cancel = new Fl_Button(230, 110, 60, 20, "Cancel"); + c_panel_cancel->shortcut(0xff1b); + c_panel_cancel->labelsize(11); + } // Fl_Button* c_panel_cancel { Fl_Box* o = new Fl_Box(10, 110, 140, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o o->size_range(o->w(), o->h(), Fl::w(), o->h()); - o->set_modal(); - o->end(); - } - return w; + class_panel->set_modal(); + class_panel->end(); + } // Fl_Double_Window* class_panel + return class_panel; } Fl_Double_Window *comment_panel=(Fl_Double_Window *)0; @@ -421,71 +418,69 @@ Fl_Menu_Button *comment_predefined=(Fl_Menu_Button *)0; Fl_Button *comment_load=(Fl_Button *)0; Fl_Double_Window* make_comment_panel() { - Fl_Double_Window* w; { Fl_Double_Window* o = comment_panel = new Fl_Double_Window(550, 280, "Comment Properties"); - w = o; - o->labelsize(11); + comment_panel->labelsize(11); { CodeEditor* o = comment_input = new CodeEditor(110, 10, 430, 230); - o->box(FL_DOWN_BOX); - o->color(FL_BACKGROUND2_COLOR); - o->selection_color(FL_SELECTION_COLOR); - o->labeltype(FL_NORMAL_LABEL); - o->labelfont(0); - o->labelsize(11); - o->labelcolor(FL_FOREGROUND_COLOR); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP); - o->when(FL_WHEN_RELEASE); - Fl_Group::current()->resizable(o); + comment_input->box(FL_DOWN_BOX); + comment_input->color(FL_BACKGROUND2_COLOR); + comment_input->selection_color(FL_SELECTION_COLOR); + comment_input->labeltype(FL_NORMAL_LABEL); + comment_input->labelfont(0); + comment_input->labelsize(11); + comment_input->labelcolor(FL_FOREGROUND_COLOR); + comment_input->textfont(4); + comment_input->textsize(11); + comment_input->align(FL_ALIGN_TOP); + comment_input->when(FL_WHEN_RELEASE); + Fl_Group::current()->resizable(comment_input); o->when(FL_WHEN_ENTER_KEY_CHANGED|FL_WHEN_RELEASE); - } + } // CodeEditor* comment_input { Fl_Group* o = new Fl_Group(110, 250, 430, 20); o->labelsize(11); - { Fl_Return_Button* o = comment_panel_ok = new Fl_Return_Button(370, 250, 80, 20, "OK"); - o->labelsize(11); - w->hotspot(o); - } - { Fl_Button* o = comment_panel_cancel = new Fl_Button(460, 250, 80, 20, "Cancel"); - o->shortcut(0xff1b); - o->labelsize(11); - } + { comment_panel_ok = new Fl_Return_Button(370, 250, 80, 20, "OK"); + comment_panel_ok->labelsize(11); + comment_panel_ok->window()->hotspot(comment_panel_ok); + } // Fl_Return_Button* comment_panel_ok + { comment_panel_cancel = new Fl_Button(460, 250, 80, 20, "Cancel"); + comment_panel_cancel->shortcut(0xff1b); + comment_panel_cancel->labelsize(11); + } // Fl_Button* comment_panel_cancel { Fl_Box* o = new Fl_Box(110, 250, 250, 20); o->labelsize(11); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o { Fl_Group* o = new Fl_Group(10, 10, 90, 243); o->labelsize(11); - { Fl_Light_Button* o = comment_in_source = new Fl_Light_Button(10, 10, 90, 20, "In Source"); - o->tooltip("Put the comment into the source (.cxx) file."); - o->labelsize(11); - o->when(FL_WHEN_NEVER); - } - { Fl_Light_Button* o = comment_in_header = new Fl_Light_Button(10, 40, 90, 20, "In Header"); - o->tooltip("Put the comment into the header (.h) file."); - o->labelsize(11); - o->when(FL_WHEN_NEVER); - } - { Fl_Menu_Button* o = comment_predefined = new Fl_Menu_Button(10, 70, 90, 20, "Predefined"); - o->labelsize(11); - o->textsize(11); - } - { Fl_Button* o = comment_load = new Fl_Button(10, 100, 90, 20, "Import..."); - o->labelsize(11); - } + { comment_in_source = new Fl_Light_Button(10, 10, 90, 20, "In Source"); + comment_in_source->tooltip("Put the comment into the source (.cxx) file."); + comment_in_source->labelsize(11); + comment_in_source->when(FL_WHEN_NEVER); + } // Fl_Light_Button* comment_in_source + { comment_in_header = new Fl_Light_Button(10, 40, 90, 20, "In Header"); + comment_in_header->tooltip("Put the comment into the header (.h) file."); + comment_in_header->labelsize(11); + comment_in_header->when(FL_WHEN_NEVER); + } // Fl_Light_Button* comment_in_header + { comment_predefined = new Fl_Menu_Button(10, 70, 90, 20, "Predefined"); + comment_predefined->labelsize(11); + comment_predefined->textsize(11); + } // Fl_Menu_Button* comment_predefined + { comment_load = new Fl_Button(10, 100, 90, 20, "Import..."); + comment_load->labelsize(11); + } // Fl_Button* comment_load { Fl_Box* o = new Fl_Box(10, 132, 90, 121); o->labelsize(11); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } + } // Fl_Group* o o->size_range(320, 180); - o->set_modal(); - o->end(); - } - return w; + comment_panel->set_modal(); + comment_panel->end(); + } // Fl_Double_Window* comment_panel + return comment_panel; } void type_make_cb(Fl_Widget*w,void*d) { @@ -504,430 +499,420 @@ void type_make_cb(Fl_Widget*w,void*d) { Fl_Window *widgetbin_panel=(Fl_Window *)0; Fl_Window* make_widgetbin() { - Fl_Window* w; - { Fl_Window* o = widgetbin_panel = new Fl_Window(520, 85, "Widget Bin"); - w = o; + { widgetbin_panel = new Fl_Window(551, 85, "Widget Bin"); + widgetbin_panel->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE); { Fl_Group* o = new Fl_Group(3, 3, 79, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(5, 5, 25, 25); + { Fl_Button* o = new Fl_Button(5, 5, 24, 24); o->tooltip("Function"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Function")); o->image(pixmap[7]); - } - { Fl_Button* o = new Fl_Button(30, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(30, 5, 24, 24); o->tooltip("Class"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Class")); o->image(pixmap[12]); - } - { Fl_Button* o = new Fl_Button(55, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(55, 5, 24, 24); o->tooltip("Comment"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("comment")); o->image(pixmap[46]); - } - { Fl_Button* o = new Fl_Button(5, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(5, 30, 24, 24); o->tooltip("Code"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Code")); o->image(pixmap[8]); - } - { Fl_Button* o = new Fl_Button(30, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(30, 30, 24, 24); o->tooltip("Code Block"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("CodeBlock")); o->image(pixmap[9]); - } - { Fl_Button* o = new Fl_Button(55, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(55, 30, 24, 24); o->tooltip("Widget Class"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("widget_class")); o->image(pixmap[48]); - } - { Fl_Button* o = new Fl_Button(5, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(5, 55, 24, 24); o->tooltip("Declaration"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("decl")); o->image(pixmap[10]); - } - { Fl_Button* o = new Fl_Button(30, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(30, 55, 24, 24); o->tooltip("Declaration Block"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("declblock")); o->image(pixmap[11]); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(83, 3, 79, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(85, 5, 25, 25); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(87, 3, 79, 79); + { Fl_Button* o = new Fl_Button(89, 5, 24, 24); o->tooltip("Window"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Window")); o->image(pixmap[1]); - } - { Fl_Button* o = new Fl_Button(110, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(114, 5, 24, 24); o->tooltip("Group"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Group")); o->image(pixmap[6]); - } - { Fl_Button* o = new Fl_Button(135, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(139, 5, 24, 24); o->tooltip("Pack"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Pack")); o->image(pixmap[22]); - } - { Fl_Button* o = new Fl_Button(85, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(89, 30, 24, 24); o->tooltip("Tabs"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tabs")); o->image(pixmap[13]); - } - { Fl_Button* o = new Fl_Button(110, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(114, 30, 24, 24); o->tooltip("Scroll"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scroll")); o->image(pixmap[19]); - } - { Fl_Button* o = new Fl_Button(85, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(89, 55, 24, 24); o->tooltip("Tile"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tile")); o->image(pixmap[20]); - } - { Fl_Button* o = new Fl_Button(110, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(114, 55, 24, 24); o->tooltip("Wizard"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Wizard")); o->image(pixmap[21]); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(163, 3, 54, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(165, 5, 25, 25); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(171, 3, 54, 79); + { Fl_Button* o = new Fl_Button(173, 5, 24, 24); o->tooltip("Button"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Button")); o->image(pixmap[2]); - } - { Fl_Button* o = new Fl_Button(190, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(198, 5, 24, 24); o->tooltip("Return Button"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Return_Button")); o->image(pixmap[23]); - } - { Fl_Button* o = new Fl_Button(165, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(173, 30, 24, 24); o->tooltip("Light Button"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Light_Button")); o->image(pixmap[24]); - } - { Fl_Button* o = new Fl_Button(190, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(198, 30, 24, 24); o->tooltip("Repeat Button"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Repeat_Button")); o->image(pixmap[25]); - } - { Fl_Button* o = new Fl_Button(165, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(173, 55, 24, 24); o->tooltip("Check Button"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Button")); o->image(pixmap[3]); - } - { Fl_Button* o = new Fl_Button(190, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(198, 55, 24, 24); o->tooltip("Round Button"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Round_Button")); o->image(pixmap[4]); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(218, 3, 104, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(220, 5, 25, 25); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(230, 3, 104, 79); + { Fl_Button* o = new Fl_Button(232, 5, 24, 24); o->tooltip("Slider"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Slider")); o->image(pixmap[37]); - } - { Fl_Button* o = new Fl_Button(245, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(257, 5, 24, 24); o->tooltip("Scroll Bar"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scrollbar")); o->image(pixmap[38]); - } - { Fl_Button* o = new Fl_Button(270, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(282, 5, 24, 24); o->tooltip("Value Slider"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Slider")); o->image(pixmap[39]); - } - { Fl_Button* o = new Fl_Button(295, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(307, 5, 24, 24); o->tooltip("Value Output"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Output")); o->image(pixmap[45]); - } - { Fl_Button* o = new Fl_Button(220, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(232, 30, 24, 24); o->tooltip("Adjuster"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Adjuster")); o->image(pixmap[40]); - } - { Fl_Button* o = new Fl_Button(245, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(257, 30, 24, 24); o->tooltip("Counter"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Counter")); o->image(pixmap[41]); - } - { Fl_Button* o = new Fl_Button(270, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(282, 30, 24, 24); o->tooltip("Dial"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Dial")); o->image(pixmap[42]); - } - { Fl_Button* o = new Fl_Button(220, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(232, 55, 24, 24); o->tooltip("Roller"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Roller")); o->image(pixmap[43]); - } - { Fl_Button* o = new Fl_Button(245, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(257, 55, 24, 24); o->tooltip("Spinner"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Spinner")); o->image(pixmap[47]); - } - { Fl_Button* o = new Fl_Button(270, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(282, 55, 24, 24); o->tooltip("Value Input"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Input")); o->image(pixmap[44]); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(323, 3, 54, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(325, 5, 25, 25); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(339, 3, 54, 79); + { Fl_Button* o = new Fl_Button(341, 5, 24, 24); o->tooltip("Input"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input")); o->image(pixmap[14]); - } - { Fl_Button* o = new Fl_Button(350, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(366, 5, 24, 24); o->tooltip("Output"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Output")); o->image(pixmap[27]); - } - { Fl_Button* o = new Fl_Button(325, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(341, 30, 24, 24); o->tooltip("Text Edit"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Editor")); o->image(pixmap[29]); - } - { Fl_Button* o = new Fl_Button(350, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(366, 30, 24, 24); o->tooltip("Text Display"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Display")); o->image(pixmap[28]); - } - { Fl_Button* o = new Fl_Button(325, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(341, 55, 24, 24); o->tooltip("File Input"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Input")); o->image(pixmap[30]); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(378, 3, 54, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(380, 5, 25, 25); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(398, 3, 54, 79); + { Fl_Button* o = new Fl_Button(400, 5, 24, 24); o->tooltip("Menu Bar"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Bar")); o->image(pixmap[17]); - } - { Fl_Button* o = new Fl_Button(405, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(425, 5, 24, 24); o->tooltip("Input Choice"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input_Choice")); o->image(pixmap[15]); - } - { Fl_Button* o = new Fl_Button(380, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(400, 30, 24, 24); o->tooltip("Menu Button"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Button")); o->image(pixmap[26]); - } - { Fl_Button* o = new Fl_Button(405, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(425, 30, 24, 24); o->tooltip("Menu Item"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("menuitem")); o->image(pixmap[16]); - } - { Fl_Button* o = new Fl_Button(380, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(400, 55, 24, 24); o->tooltip("Choice"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Choice")); o->image(pixmap[15]); - } - { Fl_Button* o = new Fl_Button(405, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(425, 55, 24, 24); o->tooltip("Sub Menu"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("submenu")); o->image(pixmap[18]); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(433, 3, 29, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(435, 5, 25, 25); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(457, 3, 29, 79); + { Fl_Button* o = new Fl_Button(459, 5, 24, 24); o->tooltip("Browser"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Browser")); o->image(pixmap[31]); - } - { Fl_Button* o = new Fl_Button(435, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(459, 30, 24, 24); o->tooltip("Check Browser"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Browser")); o->image(pixmap[32]); - } - { Fl_Button* o = new Fl_Button(435, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(459, 55, 24, 24); o->tooltip("File Browser"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Browser")); o->image(pixmap[33]); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(463, 3, 54, 79); - o->box(FL_THIN_DOWN_BOX); - { Fl_Button* o = new Fl_Button(465, 5, 25, 25); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(491, 3, 55, 79); + { Fl_Button* o = new Fl_Button(493, 5, 24, 24); o->tooltip("Box"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Box")); o->image(pixmap[5]); - } - { Fl_Button* o = new Fl_Button(490, 5, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(518, 5, 24, 24); o->tooltip("Clock"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Clock")); o->image(pixmap[34]); - } - { Fl_Button* o = new Fl_Button(465, 30, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(493, 30, 24, 24); o->tooltip("Help Browser"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Help_View")); o->image(pixmap[35]); - } - { Fl_Button* o = new Fl_Button(465, 55, 25, 25); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(493, 55, 24, 24); o->tooltip("Progress"); o->box(FL_THIN_UP_BOX); o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Progress")); o->image(pixmap[36]); - } + } // Fl_Button* o o->end(); - } - o->set_non_modal(); - o->end(); - } - return w; + } // Fl_Group* o + widgetbin_panel->set_non_modal(); + widgetbin_panel->end(); + } // Fl_Window* widgetbin_panel + return widgetbin_panel; } Fl_Double_Window *sourceview_panel=(Fl_Double_Window *)0; Fl_Tabs *sv_tab=(Fl_Tabs *)0; -CodeEditor *sv_source=(CodeEditor *)0; +CodeViewer *sv_source=(CodeViewer *)0; -CodeEditor *sv_header=(CodeEditor *)0; +CodeViewer *sv_header=(CodeViewer *)0; Fl_Light_Button *sv_autorefresh=(Fl_Light_Button *)0; Fl_Light_Button *sv_autoposition=(Fl_Light_Button *)0; Fl_Double_Window* make_sourceview() { - Fl_Double_Window* w; - { Fl_Double_Window* o = sourceview_panel = new Fl_Double_Window(520, 490, "Code View"); - w = o; - o->callback((Fl_Callback*)toggle_sourceview_cb); - { Fl_Tabs* o = sv_tab = new Fl_Tabs(10, 10, 500, 440); - o->selection_color((Fl_Color)4); - o->labelcolor(FL_BACKGROUND2_COLOR); - o->callback((Fl_Callback*)update_sourceview_position_cb); + { sourceview_panel = new Fl_Double_Window(520, 490, "Code View"); + sourceview_panel->callback((Fl_Callback*)toggle_sourceview_cb); + sourceview_panel->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE); + { sv_tab = new Fl_Tabs(10, 10, 500, 440); + sv_tab->selection_color((Fl_Color)4); + sv_tab->labelcolor(FL_BACKGROUND2_COLOR); + sv_tab->callback((Fl_Callback*)update_sourceview_position_cb); { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Source"); o->labelsize(13); o->hide(); - { CodeEditor* o = sv_source = new CodeEditor(20, 50, 480, 390); - o->box(FL_DOWN_FRAME); - o->color(FL_BACKGROUND2_COLOR); - o->selection_color(FL_SELECTION_COLOR); - o->labeltype(FL_NORMAL_LABEL); - o->labelfont(0); - o->labelsize(14); - o->labelcolor(FL_FOREGROUND_COLOR); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP); - o->when(FL_WHEN_RELEASE); - Fl_Group::current()->resizable(o); - } + { sv_source = new CodeViewer(20, 50, 480, 390); + sv_source->box(FL_DOWN_FRAME); + sv_source->color(FL_BACKGROUND2_COLOR); + sv_source->selection_color(FL_SELECTION_COLOR); + sv_source->labeltype(FL_NORMAL_LABEL); + sv_source->labelfont(0); + sv_source->labelsize(14); + sv_source->labelcolor(FL_FOREGROUND_COLOR); + sv_source->textfont(4); + sv_source->textsize(11); + sv_source->align(FL_ALIGN_TOP); + sv_source->when(FL_WHEN_RELEASE); + Fl_Group::current()->resizable(sv_source); + } // CodeViewer* sv_source o->end(); Fl_Group::current()->resizable(o); - } + } // Fl_Group* o { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Header"); o->labelsize(13); - { CodeEditor* o = sv_header = new CodeEditor(20, 50, 480, 390); - o->box(FL_DOWN_FRAME); - o->color(FL_BACKGROUND2_COLOR); - o->selection_color(FL_SELECTION_COLOR); - o->labeltype(FL_NORMAL_LABEL); - o->labelfont(0); - o->labelsize(14); - o->labelcolor(FL_FOREGROUND_COLOR); - o->textfont(4); - o->textsize(11); - o->align(FL_ALIGN_TOP); - o->when(FL_WHEN_RELEASE); - Fl_Group::current()->resizable(o); - } + { sv_header = new CodeViewer(20, 50, 480, 390); + sv_header->box(FL_DOWN_FRAME); + sv_header->color(FL_BACKGROUND2_COLOR); + sv_header->selection_color(FL_SELECTION_COLOR); + sv_header->labeltype(FL_NORMAL_LABEL); + sv_header->labelfont(0); + sv_header->labelsize(14); + sv_header->labelcolor(FL_FOREGROUND_COLOR); + sv_header->textfont(4); + sv_header->textsize(11); + sv_header->align(FL_ALIGN_TOP); + sv_header->when(FL_WHEN_RELEASE); + Fl_Group::current()->resizable(sv_header); + } // CodeViewer* sv_header o->end(); - } - o->end(); - Fl_Group::current()->resizable(o); - } + } // Fl_Group* o + sv_tab->end(); + Fl_Group::current()->resizable(sv_tab); + } // Fl_Tabs* sv_tab { Fl_Group* o = new Fl_Group(10, 460, 500, 20); { Fl_Button* o = new Fl_Button(10, 460, 61, 20, "Refresh"); o->labelsize(11); o->callback((Fl_Callback*)update_sourceview_cb); - } + } // Fl_Button* o { Fl_Light_Button* o = sv_autorefresh = new Fl_Light_Button(76, 460, 91, 20, "Auto-Refresh"); - o->labelsize(11); + sv_autorefresh->labelsize(11); o->callback((Fl_Callback*)update_sourceview_cb); - } - { Fl_Light_Button* o = sv_autoposition = new Fl_Light_Button(172, 460, 89, 20, "Auto-Position"); - o->labelsize(11); - } + } // Fl_Light_Button* sv_autorefresh + { sv_autoposition = new Fl_Light_Button(172, 460, 89, 20, "Auto-Position"); + sv_autoposition->labelsize(11); + } // Fl_Light_Button* sv_autoposition { Fl_Button* o = new Fl_Button(460, 460, 50, 20, "Close"); o->labelsize(11); o->callback((Fl_Callback*)toggle_sourceview_b_cb); - } + } // Fl_Button* o { Fl_Box* o = new Fl_Box(265, 460, 190, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - o->size_range(384, 120); - o->end(); - } - return w; + } // Fl_Group* o + sourceview_panel->size_range(384, 120); + sourceview_panel->end(); + } // Fl_Double_Window* sourceview_panel + return sourceview_panel; } // -// End of "$Id: function_panel.cxx 4632 2005-11-03 22:16:52Z mike $". +// End of "$Id: function_panel.cxx 5440 2006-09-17 18:31:35Z matt $". // diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl index 05528ce..0c767f6 100644 --- a/fluid/function_panel.fl +++ b/fluid/function_panel.fl @@ -1,9 +1,9 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0107 +version 1.0108 header_name {.h} code_name {.cxx} comment {// -// "$Id: function_panel.fl 4638 2005-11-04 15:16:24Z matt $" +// "$Id: function_panel.fl 5440 2006-09-17 18:31:35Z matt $" // // Code dialogs for the Fast Light Tool Kit (FLTK). // @@ -201,9 +201,9 @@ Function {make_declblock_panel()} {open Function {make_decl_panel()} {open } { Fl_Window decl_panel { - label {Declaration Properties} - xywh {412 206 290 150} type Double hide resizable - code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} + label {Declaration Properties} open + xywh {412 206 290 150} type Double align 80 resizable + code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} visible } { Fl_Group {} {open xywh {10 10 270 20} @@ -212,8 +212,12 @@ Function {make_decl_panel()} {open label public tooltip {Make the declaration publicly accessible.} xywh {10 10 60 20} labelsize 11 when 0 } + Fl_Light_Button decl_static_button { + label static + tooltip {Prepend 'static' to private declarations in the source code, or 'extern' to public declarations in the header file.} xywh {80 10 60 20} labelsize 11 when 0 + } Fl_Box {} { - xywh {80 10 200 20} resizable + xywh {150 10 130 20} resizable } } Fl_Input decl_input { @@ -352,332 +356,332 @@ Function {type_make_cb(Fl_Widget*w,void*d)} {open return_type void Function {make_widgetbin()} {open } { Fl_Window widgetbin_panel { - label {Widget Bin} - xywh {413 185 520 85} type Single non_modal visible + label {Widget Bin} selected + xywh {411 171 551 85} type Single align 80 non_modal visible } { Fl_Group {} { - xywh {3 3 79 79} box THIN_DOWN_BOX + xywh {3 3 79 79} } { Fl_Button {} { user_data {"Function"} callback type_make_cb - tooltip Function xywh {5 5 25 25} box THIN_UP_BOX + tooltip Function xywh {5 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[7]);} } Fl_Button {} { user_data {"Class"} callback type_make_cb - tooltip Class xywh {30 5 25 25} box THIN_UP_BOX + tooltip Class xywh {30 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[12]);} } Fl_Button {} { user_data {"comment"} callback type_make_cb - tooltip Comment xywh {55 5 25 25} box THIN_UP_BOX + tooltip Comment xywh {55 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[46]);} } Fl_Button {} { user_data {"Code"} callback type_make_cb - tooltip Code xywh {5 30 25 25} box THIN_UP_BOX + tooltip Code xywh {5 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[8]);} } Fl_Button {} { user_data {"CodeBlock"} callback type_make_cb - tooltip {Code Block} xywh {30 30 25 25} box THIN_UP_BOX + tooltip {Code Block} xywh {30 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[9]);} } Fl_Button {} { user_data {"widget_class"} callback type_make_cb - tooltip {Widget Class} xywh {55 30 25 25} box THIN_UP_BOX + tooltip {Widget Class} xywh {55 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[48]);} } Fl_Button {} { user_data {"decl"} callback type_make_cb - tooltip Declaration xywh {5 55 25 25} box THIN_UP_BOX + tooltip Declaration xywh {5 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[10]);} } Fl_Button {} { user_data {"declblock"} - callback type_make_cb selected - tooltip {Declaration Block} xywh {30 55 25 25} box THIN_UP_BOX + callback type_make_cb + tooltip {Declaration Block} xywh {30 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[11]);} } } Fl_Group {} { - xywh {83 3 79 79} box THIN_DOWN_BOX + xywh {87 3 79 79} } { Fl_Button {} { user_data {"Fl_Window"} callback type_make_cb - tooltip Window xywh {85 5 25 25} box THIN_UP_BOX + tooltip Window xywh {89 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[1]);} } Fl_Button {} { user_data {"Fl_Group"} callback type_make_cb - tooltip Group xywh {110 5 25 25} box THIN_UP_BOX + tooltip Group xywh {114 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[6]);} } Fl_Button {} { user_data {"Fl_Pack"} callback type_make_cb - tooltip Pack xywh {135 5 25 25} box THIN_UP_BOX + tooltip Pack xywh {139 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[22]);} } Fl_Button {} { user_data {"Fl_Tabs"} callback type_make_cb - tooltip Tabs xywh {85 30 25 25} box THIN_UP_BOX + tooltip Tabs xywh {89 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[13]);} } Fl_Button {} { user_data {"Fl_Scroll"} callback type_make_cb - tooltip Scroll xywh {110 30 25 25} box THIN_UP_BOX + tooltip Scroll xywh {114 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[19]);} } Fl_Button {} { user_data {"Fl_Tile"} callback type_make_cb - tooltip Tile xywh {85 55 25 25} box THIN_UP_BOX + tooltip Tile xywh {89 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[20]);} } Fl_Button {} { user_data {"Fl_Wizard"} callback type_make_cb - tooltip Wizard xywh {110 55 25 25} box THIN_UP_BOX + tooltip Wizard xywh {114 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[21]);} } } Fl_Group {} { - xywh {163 3 54 79} box THIN_DOWN_BOX + xywh {171 3 54 79} } { Fl_Button {} { user_data {"Fl_Button"} callback type_make_cb - tooltip Button xywh {165 5 25 25} box THIN_UP_BOX + tooltip Button xywh {173 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[2]);} } Fl_Button {} { user_data {"Fl_Return_Button"} callback type_make_cb - tooltip {Return Button} xywh {190 5 25 25} box THIN_UP_BOX + tooltip {Return Button} xywh {198 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[23]);} } Fl_Button {} { user_data {"Fl_Light_Button"} callback type_make_cb - tooltip {Light Button} xywh {165 30 25 25} box THIN_UP_BOX + tooltip {Light Button} xywh {173 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[24]);} } Fl_Button {} { user_data {"Fl_Repeat_Button"} callback type_make_cb - tooltip {Repeat Button} xywh {190 30 25 25} box THIN_UP_BOX + tooltip {Repeat Button} xywh {198 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[25]);} } Fl_Button {} { user_data {"Fl_Check_Button"} callback type_make_cb - tooltip {Check Button} xywh {165 55 25 25} box THIN_UP_BOX + tooltip {Check Button} xywh {173 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[3]);} } Fl_Button {} { user_data {"Fl_Round_Button"} callback type_make_cb - tooltip {Round Button} xywh {190 55 25 25} box THIN_UP_BOX + tooltip {Round Button} xywh {198 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[4]);} } } Fl_Group {} { - xywh {218 3 104 79} box THIN_DOWN_BOX + xywh {230 3 104 79} } { Fl_Button {} { user_data {"Fl_Slider"} callback type_make_cb - tooltip Slider xywh {220 5 25 25} box THIN_UP_BOX + tooltip Slider xywh {232 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[37]);} } Fl_Button {} { user_data {"Fl_Scrollbar"} callback type_make_cb - tooltip {Scroll Bar} xywh {245 5 25 25} box THIN_UP_BOX + tooltip {Scroll Bar} xywh {257 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[38]);} } Fl_Button {} { user_data {"Fl_Value_Slider"} callback type_make_cb - tooltip {Value Slider} xywh {270 5 25 25} box THIN_UP_BOX + tooltip {Value Slider} xywh {282 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[39]);} } Fl_Button {} { user_data {"Fl_Value_Output"} callback type_make_cb - tooltip {Value Output} xywh {295 5 25 25} box THIN_UP_BOX + tooltip {Value Output} xywh {307 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[45]);} } Fl_Button {} { user_data {"Fl_Adjuster"} callback type_make_cb - tooltip Adjuster xywh {220 30 25 25} box THIN_UP_BOX + tooltip Adjuster xywh {232 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[40]);} } Fl_Button {} { user_data {"Fl_Counter"} callback type_make_cb - tooltip Counter xywh {245 30 25 25} box THIN_UP_BOX + tooltip Counter xywh {257 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[41]);} } Fl_Button {} { user_data {"Fl_Dial"} callback type_make_cb - tooltip Dial xywh {270 30 25 25} box THIN_UP_BOX + tooltip Dial xywh {282 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[42]);} } Fl_Button {} { user_data {"Fl_Roller"} callback type_make_cb - tooltip Roller xywh {220 55 25 25} box THIN_UP_BOX + tooltip Roller xywh {232 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[43]);} } Fl_Button {} { user_data {"Fl_Spinner"} callback type_make_cb - tooltip Spinner xywh {245 55 25 25} box THIN_UP_BOX + tooltip Spinner xywh {257 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[47]);} } Fl_Button {} { user_data {"Fl_Value_Input"} callback type_make_cb - tooltip {Value Input} xywh {270 55 25 25} box THIN_UP_BOX + tooltip {Value Input} xywh {282 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[44]);} } } Fl_Group {} { - xywh {323 3 54 79} box THIN_DOWN_BOX + xywh {339 3 54 79} } { Fl_Button {} { user_data {"Fl_Input"} callback type_make_cb - tooltip Input xywh {325 5 25 25} box THIN_UP_BOX + tooltip Input xywh {341 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[14]);} } Fl_Button {} { user_data {"Fl_Output"} callback type_make_cb - tooltip Output xywh {350 5 25 25} box THIN_UP_BOX + tooltip Output xywh {366 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[27]);} } Fl_Button {} { user_data {"Fl_Text_Editor"} callback type_make_cb - tooltip {Text Edit} xywh {325 30 25 25} box THIN_UP_BOX + tooltip {Text Edit} xywh {341 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[29]);} } Fl_Button {} { user_data {"Fl_Text_Display"} callback type_make_cb - tooltip {Text Display} xywh {350 30 25 25} box THIN_UP_BOX + tooltip {Text Display} xywh {366 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[28]);} } Fl_Button {} { user_data {"Fl_File_Input"} callback type_make_cb - tooltip {File Input} xywh {325 55 25 25} box THIN_UP_BOX + tooltip {File Input} xywh {341 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[30]);} } } Fl_Group {} { - xywh {378 3 54 79} box THIN_DOWN_BOX + xywh {398 3 54 79} } { Fl_Button {} { user_data {"Fl_Menu_Bar"} callback type_make_cb - tooltip {Menu Bar} xywh {380 5 25 25} box THIN_UP_BOX + tooltip {Menu Bar} xywh {400 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[17]);} } Fl_Button {} { user_data {"Fl_Input_Choice"} callback type_make_cb - tooltip {Input Choice} xywh {405 5 25 25} box THIN_UP_BOX + tooltip {Input Choice} xywh {425 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[15]);} } Fl_Button {} { user_data {"Fl_Menu_Button"} callback type_make_cb - tooltip {Menu Button} xywh {380 30 25 25} box THIN_UP_BOX + tooltip {Menu Button} xywh {400 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[26]);} } Fl_Button {} { user_data {"menuitem"} callback type_make_cb - tooltip {Menu Item} xywh {405 30 25 25} box THIN_UP_BOX + tooltip {Menu Item} xywh {425 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[16]);} } Fl_Button {} { user_data {"Fl_Choice"} callback type_make_cb - tooltip Choice xywh {380 55 25 25} box THIN_UP_BOX + tooltip Choice xywh {400 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[15]);} } Fl_Button {} { user_data {"submenu"} callback type_make_cb - tooltip {Sub Menu} xywh {405 55 25 25} box THIN_UP_BOX + tooltip {Sub Menu} xywh {425 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[18]);} } } Fl_Group {} { - xywh {433 3 29 79} box THIN_DOWN_BOX + xywh {457 3 29 79} } { Fl_Button {} { user_data {"Fl_Browser"} callback type_make_cb - tooltip Browser xywh {435 5 25 25} box THIN_UP_BOX + tooltip Browser xywh {459 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[31]);} } Fl_Button {} { user_data {"Fl_Check_Browser"} callback type_make_cb - tooltip {Check Browser} xywh {435 30 25 25} box THIN_UP_BOX + tooltip {Check Browser} xywh {459 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[32]);} } Fl_Button {} { user_data {"Fl_File_Browser"} callback type_make_cb - tooltip {File Browser} xywh {435 55 25 25} box THIN_UP_BOX + tooltip {File Browser} xywh {459 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[33]);} } } Fl_Group {} { - xywh {463 3 54 79} box THIN_DOWN_BOX + xywh {491 3 55 79} } { Fl_Button {} { user_data {"Fl_Box"} callback type_make_cb - tooltip Box xywh {465 5 25 25} box THIN_UP_BOX + tooltip Box xywh {493 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[5]);} } Fl_Button {} { user_data {"Fl_Clock"} callback type_make_cb - tooltip Clock xywh {490 5 25 25} box THIN_UP_BOX + tooltip Clock xywh {518 5 24 24} box THIN_UP_BOX code0 {o->image(pixmap[34]);} } Fl_Button {} { user_data {"Fl_Help_View"} callback type_make_cb - tooltip {Help Browser} xywh {465 30 25 25} box THIN_UP_BOX + tooltip {Help Browser} xywh {493 30 24 24} box THIN_UP_BOX code0 {o->image(pixmap[35]);} } Fl_Button {} { user_data {"Fl_Progress"} callback type_make_cb - tooltip Progress xywh {465 55 25 25} box THIN_UP_BOX + tooltip Progress xywh {493 55 24 24} box THIN_UP_BOX code0 {o->image(pixmap[36]);} } } @@ -689,7 +693,7 @@ Function {make_sourceview()} {open Fl_Window sourceview_panel { label {Code View} callback toggle_sourceview_cb - xywh {533 374 520 490} type Double resizable size_range {384 120 0 0} visible + xywh {533 374 520 490} type Double align 80 resizable size_range {384 120 0 0} visible } { Fl_Tabs sv_tab { callback update_sourceview_position_cb @@ -702,7 +706,7 @@ Function {make_sourceview()} {open Fl_Text_Editor sv_source { xywh {20 50 480 390} textfont 4 textsize 11 resizable code0 {\#include "CodeEditor.h"} - class CodeEditor + class CodeViewer } } Fl_Group {} { @@ -712,7 +716,7 @@ Function {make_sourceview()} {open Fl_Text_Editor sv_header { xywh {20 50 480 390} textfont 4 textsize 11 resizable code0 {\#include "CodeEditor.h"} - class CodeEditor + class CodeViewer } } } @@ -747,6 +751,6 @@ Function {make_sourceview()} {open comment { // -// End of "$Id: function_panel.fl 4638 2005-11-04 15:16:24Z matt $". +// End of "$Id: function_panel.fl 5440 2006-09-17 18:31:35Z matt $". //} {in_source in_header } diff --git a/fluid/function_panel.h b/fluid/function_panel.h index 9094725..1f65611 100644 --- a/fluid/function_panel.h +++ b/fluid/function_panel.h @@ -1,5 +1,5 @@ // -// "$Id: function_panel.h 4630 2005-11-03 20:43:19Z matt $" +// "$Id: function_panel.h 5440 2006-09-17 18:31:35Z matt $" // // Code dialogs for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #ifndef function_panel_h #define function_panel_h @@ -66,6 +66,7 @@ extern Fl_Light_Button *declblock_public_button; Fl_Double_Window* make_declblock_panel(); extern Fl_Double_Window *decl_panel; extern Fl_Light_Button *decl_public_button; +extern Fl_Light_Button *decl_static_button; extern Fl_Input *decl_input; extern Fl_Return_Button *decl_panel_ok; extern Fl_Button *decl_panel_cancel; @@ -97,8 +98,8 @@ extern Fl_Double_Window *sourceview_panel; #include <FL/Fl_Tabs.H> extern void update_sourceview_position_cb(Fl_Tabs*, void*); extern Fl_Tabs *sv_tab; -extern CodeEditor *sv_source; -extern CodeEditor *sv_header; +extern CodeViewer *sv_source; +extern CodeViewer *sv_header; extern void update_sourceview_cb(Fl_Button*, void*); extern Fl_Light_Button *sv_autorefresh; extern Fl_Light_Button *sv_autoposition; @@ -107,5 +108,5 @@ Fl_Double_Window* make_sourceview(); #endif // -// End of "$Id: function_panel.h 4630 2005-11-03 20:43:19Z matt $". +// End of "$Id: function_panel.h 5440 2006-09-17 18:31:35Z matt $". // diff --git a/fluid/makedepend b/fluid/makedepend index 86b86c1..2e02082 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -1,327 +1,294 @@ -# DO NOT DELETE - -CodeEditor.o: CodeEditor.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -CodeEditor.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H -CodeEditor.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Group.H -CodeEditor.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -CodeEditor.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H -Fl_Function_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Function_Type.o: ../FL/Fl_Preferences.H ../FL/Fl_File_Chooser.H -Fl_Function_Type.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -Fl_Function_Type.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Group.H -Fl_Function_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H -Fl_Function_Type.o: ../FL/Fl_Image.H ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H -Fl_Function_Type.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H -Fl_Function_Type.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H -Fl_Function_Type.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Function_Type.o: ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H -Fl_Function_Type.o: ../FL/filename.H ../FL/Fl_Box.H ../FL/Fl_Check_Button.H -Fl_Function_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H -Fl_Function_Type.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fl_Function_Type.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H Fl_Type.h -Fl_Function_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H Fluid_Image.h -Fl_Function_Type.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H -Fl_Function_Type.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -Fl_Function_Type.o: ../FL/Fl_Input_Choice.H ../FL/Fl_Window.H -Fl_Function_Type.o: ../FL/Fl_Menu_Bar.H ../FL/fl_show_input.H ../FL/fl_ask.H -Fl_Function_Type.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h -Fl_Function_Type.o: function_panel.h ../FL/Fl_Light_Button.H CodeEditor.h -Fl_Function_Type.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H -Fl_Function_Type.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H -Fl_Function_Type.o: ../FL/Fl_Text_Buffer.H comments.h -Fl_Group_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/fl_message.H ../FL/fl_ask.H -Fl_Group_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H -Fl_Group_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fl_Group_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/fl_draw.H -Fl_Group_Type.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H -Fl_Group_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H -Fl_Group_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H -Fl_Group_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Window.H -Fl_Group_Type.o: ../FL/Fl_Menu_Bar.H ../src/flstring.h ../FL/Fl_Export.H -Fl_Group_Type.o: ../config.h ../FL/Fl_Scroll.H ../FL/Fl_Scrollbar.H -Fl_Group_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Menu_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Menu_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H -Fl_Menu_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fl_Menu_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/fl_draw.H -Fl_Menu_Type.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H -Fl_Menu_Type.o: ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -Fl_Menu_Type.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -Fl_Menu_Type.o: ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fl_Menu_Type.o: ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H alignment_panel.h -Fl_Menu_Type.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H -Fl_Menu_Type.o: ../FL/fl_draw.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Menu_Type.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H -Fl_Menu_Type.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -Fl_Menu_Type.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Button.H -Fl_Menu_Type.o: ../FL/Fl_Box.H ../FL/Fl_Light_Button.H -Fl_Menu_Type.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H -Fl_Menu_Type.o: ../FL/Fl_Button.H ../FL/Fl_Spinner.H ../FL/Fl_Repeat_Button.H -Fl_Menu_Type.o: ../FL/Fl.H ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H -Fl_Menu_Type.o: ../FL/fl_message.H ../FL/fl_ask.H ../src/flstring.h -Fl_Menu_Type.o: ../FL/Fl_Export.H ../config.h ../FL/Fl_Output.H -Fl_Menu_Type.o: ../FL/Fl_Input.H Shortcut_Button.h -Fl_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Type.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -Fl_Type.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Type.o: ../FL/fl_draw.H ../src/flstring.h ../FL/Fl_Export.H ../config.h -Fl_Type.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H -Fl_Type.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H -Fl_Type.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H -Fl_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H -Fl_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H -Fl_Type.o: ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H undo.h -Fl_Type.o: ../FL/Fl_Pixmap.H pixmaps/lock.xpm pixmaps/flWindow.xpm -Fl_Type.o: pixmaps/flButton.xpm pixmaps/flCheckButton.xpm -Fl_Type.o: pixmaps/flRoundButton.xpm pixmaps/flBox.xpm pixmaps/flGroup.xpm -Fl_Type.o: pixmaps/flFunction.xpm pixmaps/flCode.xpm pixmaps/flCodeBlock.xpm -Fl_Type.o: pixmaps/flComment.xpm pixmaps/flDeclaration.xpm -Fl_Type.o: pixmaps/flDeclarationBlock.xpm pixmaps/flClass.xpm -Fl_Type.o: pixmaps/flTabs.xpm pixmaps/flInput.xpm pixmaps/flChoice.xpm -Fl_Type.o: pixmaps/flMenuitem.xpm pixmaps/flMenubar.xpm pixmaps/flSubmenu.xpm -Fl_Type.o: pixmaps/flScroll.xpm pixmaps/flTile.xpm pixmaps/flWizard.xpm -Fl_Type.o: pixmaps/flPack.xpm pixmaps/flReturnButton.xpm -Fl_Type.o: pixmaps/flLightButton.xpm pixmaps/flRepeatButton.xpm -Fl_Type.o: pixmaps/flMenuButton.xpm pixmaps/flOutput.xpm -Fl_Type.o: pixmaps/flTextDisplay.xpm pixmaps/flTextEdit.xpm -Fl_Type.o: pixmaps/flFileInput.xpm pixmaps/flBrowser.xpm -Fl_Type.o: pixmaps/flCheckBrowser.xpm pixmaps/flFileBrowser.xpm -Fl_Type.o: pixmaps/flClock.xpm pixmaps/flHelp.xpm pixmaps/flProgress.xpm -Fl_Type.o: pixmaps/flSlider.xpm pixmaps/flScrollBar.xpm -Fl_Type.o: pixmaps/flValueSlider.xpm pixmaps/flAdjuster.xpm -Fl_Type.o: pixmaps/flCounter.xpm pixmaps/flDial.xpm pixmaps/flRoller.xpm -Fl_Type.o: pixmaps/flValueInput.xpm pixmaps/flValueOutput.xpm -Fl_Type.o: pixmaps/flSpinner.xpm pixmaps/flWidgetClass.xpm -Fl_Widget_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Widget_Type.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fl_Widget_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H -Fl_Widget_Type.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H -Fl_Widget_Type.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H -Fl_Widget_Type.o: ../FL/fl_draw.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H -Fl_Widget_Type.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -Fl_Widget_Type.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -Fl_Widget_Type.o: ../FL/Fl_Input_Choice.H ../FL/Fl_Window.H -Fl_Widget_Type.o: ../FL/Fl_Menu_Bar.H alignment_panel.h -Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H -Fl_Widget_Type.o: ../FL/fl_draw.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fl_Widget_Type.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H -Fl_Widget_Type.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -Fl_Widget_Type.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Button.H -Fl_Widget_Type.o: ../FL/Fl_Box.H ../FL/Fl_Light_Button.H -Fl_Widget_Type.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H -Fl_Widget_Type.o: ../FL/Fl_Button.H ../FL/Fl_Spinner.H -Fl_Widget_Type.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H -Fl_Widget_Type.o: ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H -Fl_Widget_Type.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/Fl_Slider.H -Fl_Widget_Type.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h -Fl_Widget_Type.o: widget_panel.h ../FL/Fl_Value_Input.H ../FL/Fl_Input.H -Fl_Widget_Type.o: Shortcut_Button.h CodeEditor.h ../FL/Fl_Text_Editor.H -Fl_Widget_Type.o: ../FL/Fl_Text_Display.H ../FL/fl_show_colormap.H -Fl_Window_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fl_Window_Type.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H -Fl_Window_Type.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -Fl_Window_Type.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/fl_draw.H ../FL/x.H -Fl_Window_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H -Fl_Window_Type.o: ../FL/Fl_Round_Button.H ../FL/Fl_Light_Button.H -Fl_Window_Type.o: ../FL/Fl_Button.H Fl_Widget_Type.h Fl_Type.h -Fl_Window_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H -Fl_Window_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H -Fl_Window_Type.o: ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H -Fl_Window_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H -Fl_Window_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H -Fl_Window_Type.o: ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H -Fl_Window_Type.o: undo.h alignment_panel.h ../FL/Fl_Text_Buffer.H -Fl_Window_Type.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H -Fl_Window_Type.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Double_Window.H -Fl_Window_Type.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Button.H -Fl_Window_Type.o: ../FL/Fl_Box.H ../FL/Fl_Light_Button.H -Fl_Window_Type.o: ../FL/Fl_Check_Button.H ../FL/Fl_Spinner.H -Fl_Window_Type.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H -Fl_Window_Type.o: ../FL/Fl_Return_Button.H widget_panel.h -Fl_Window_Type.o: ../FL/Fl_Value_Input.H ../FL/Fl_Input.H Shortcut_Button.h -Fl_Window_Type.o: CodeEditor.h ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H -Fl_Window_Type.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h -Fluid_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -Fluid_Image.o: ../FL/Fl_Widget.H Fl_Type.h ../FL/Fl_Menu.H -Fluid_Image.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -Fluid_Image.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/fl_draw.H -Fluid_Image.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H -Fluid_Image.o: ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -Fluid_Image.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -Fluid_Image.o: ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -Fluid_Image.o: ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H ../src/flstring.h -Fluid_Image.o: ../FL/Fl_Export.H ../config.h ../FL/filename.H -Fluid_Image.o: ../FL/Fl_File_Chooser.H ../FL/Fl_Double_Window.H -Fluid_Image.o: ../FL/Fl_Window.H ../FL/Fl_Button.H ../FL/Fl_Preferences.H -Fluid_Image.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H -Fluid_Image.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -Fluid_Image.o: ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H -Fluid_Image.o: ../FL/filename.H ../FL/Fl_Box.H ../FL/Fl_Check_Button.H -Fluid_Image.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H -Fluid_Image.o: ../FL/Fl_File_Input.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H -about_panel.o: about_panel.h ../FL/Fl.H ../FL/Enumerations.H -about_panel.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -about_panel.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H -about_panel.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H -about_panel.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H -align_widget.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -align_widget.o: ../FL/Fl_Window.H Fl_Widget_Type.h Fl_Type.h -align_widget.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H -align_widget.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h -align_widget.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H -align_widget.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H -align_widget.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H -align_widget.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H -align_widget.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Menu_Bar.H undo.h -alignment_panel.o: alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H -alignment_panel.o: ../FL/Fl_Export.H ../FL/Fl_Text_Buffer.H -alignment_panel.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Group.H -alignment_panel.o: ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -alignment_panel.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H -alignment_panel.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -alignment_panel.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H -alignment_panel.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Tabs.H -alignment_panel.o: ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Input.H -alignment_panel.o: ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H -alignment_panel.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H -alignment_panel.o: ../FL/Fl_Image.H ../FL/Fl_Check_Button.H -alignment_panel.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H -alignment_panel.o: ../FL/Fl_Spinner.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H -alignment_panel.o: ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H -code.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H -code.o: ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h ../FL/Fl_Widget.H -code.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H -code.o: ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H -code.o: ../FL/fl_draw.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H -code.o: ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H -code.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -code.o: ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -code.o: ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H alignment_panel.h -code.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H -code.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -code.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -code.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Button.H -code.o: ../FL/Fl_Box.H ../FL/Fl_Light_Button.H ../FL/Fl_Check_Button.H -code.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Spinner.H -code.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H ../FL/Fl_Return_Button.H -code.o: ../FL/Fl_Round_Button.H ../FL/filename.H -factory.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H -factory.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H -factory.o: ../FL/Fl_Pixmap.H ../src/flstring.h ../FL/Fl_Export.H ../config.h -factory.o: undo.h Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H -factory.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h -factory.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H -factory.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H -factory.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H -factory.o: ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H -factory.o: ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H -factory.o: ../FL/Fl_Box.H ../FL/Fl_Button.H ../FL/Fl_Return_Button.H -factory.o: ../FL/Fl_Button.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H -factory.o: ../FL/Fl_Light_Button.H ../FL/Fl_Check_Button.H -factory.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H ../FL/Fl_Browser.H -factory.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -factory.o: ../FL/Fl_Valuator.H ../FL/Fl_Check_Browser.H -factory.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../FL/Fl_File_Icon.H -factory.o: ../FL/filename.H ../FL/Fl_Counter.H ../FL/Fl_Spinner.H -factory.o: ../FL/Fl_File_Input.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H -factory.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H -factory.o: ../FL/Fl_Text_Display.H ../FL/Fl_Clock.H ../FL/Fl_Help_View.H -factory.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Progress.H ../FL/Fl_Adjuster.H -factory.o: ../FL/Fl_Dial.H ../FL/Fl_Roller.H ../FL/Fl_Scrollbar.H -factory.o: ../FL/Fl_Output.H ../FL/Fl_Input.H ../FL/Fl_Value_Input.H -factory.o: ../FL/Fl_Value_Output.H ../FL/Fl_Value_Slider.H -factory.o: ../FL/Fl_Multi_Label.H -file.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h alignment_panel.h -file.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -file.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H -file.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H -file.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H -file.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Preferences.H -file.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H ../FL/Fl_Button.H -file.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Input.H -file.o: ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H ../FL/Fl_Choice.H -file.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H -file.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H -file.o: ../FL/Fl_Spinner.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H -file.o: ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H ../FL/fl_message.H -file.o: ../FL/fl_ask.H Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Menu.H -file.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Pack.H -file.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H -file.o: ../FL/Fl_Input_Choice.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H -fluid.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -fluid.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H -fluid.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Button.H -fluid.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/Fl_Help_Dialog.H -fluid.o: ../FL/Fl_Help_View.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H -fluid.o: ../FL/Fl_Valuator.H ../FL/fl_draw.H ../FL/Fl_Shared_Image.H -fluid.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -fluid.o: ../FL/Fl_Hold_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H -fluid.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H -fluid.o: ../FL/Fl_Image.H ../FL/fl_ask.H ../FL/fl_draw.H -fluid.o: ../FL/Fl_File_Chooser.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H -fluid.o: ../FL/Fl_Preferences.H ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H -fluid.o: ../FL/Fl_File_Icon.H ../FL/filename.H ../FL/Fl_Check_Button.H -fluid.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_File_Input.H -fluid.o: ../FL/Fl_Return_Button.H ../FL/fl_message.H ../FL/fl_ask.H -fluid.o: ../FL/filename.H ../src/flstring.h ../FL/Fl_Export.H ../config.h -fluid.o: alignment_panel.h ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H -fluid.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H -fluid.o: ../FL/Fl_Tabs.H ../FL/Fl_Light_Button.H ../FL/Fl_Spinner.H -fluid.o: ../FL/Fl_Repeat_Button.H ../FL/Fl_Round_Button.H function_panel.h -fluid.o: CodeEditor.h ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H -fluid.o: ../FL/Fl_Window.H template_panel.h ../FL/Fl_Browser.H -fluid.o: print_panel.cxx print_panel.h ../FL/Fl_Progress.H ../FL/Fl_Pixmap.H -fluid.o: about_panel.h undo.h Fl_Type.h ../FL/Fl_Menu.H Fluid_Image.h -fluid.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H -fluid.o: ../FL/Fl_Menu_.H ../FL/Fl_Input_Choice.H -function_panel.o: function_panel.h ../FL/Fl.H ../FL/Enumerations.H -function_panel.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H -function_panel.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -function_panel.o: ../FL/Fl_Group.H ../FL/Fl_Light_Button.H ../FL/Fl_Box.H -function_panel.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H -function_panel.o: ../FL/Fl_Button.H ../FL/Fl_Button.H CodeEditor.h -function_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H -function_panel.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H -function_panel.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -function_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Menu_Button.H -function_panel.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H -function_panel.o: ../FL/Fl_Window.H ../FL/Fl_Tabs.H ../FL/Fl_Pixmap.H -function_panel.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H Fluid_Image.h -function_panel.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Pack.H -function_panel.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H -function_panel.o: ../FL/Fl_Input_Choice.H ../FL/Fl_Menu_Bar.H undo.h -template_panel.o: template_panel.h ../FL/Fl.H ../FL/Enumerations.H -template_panel.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H -template_panel.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -template_panel.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -template_panel.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Box.H -template_panel.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Group.H -template_panel.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H -template_panel.o: ../FL/Fl_Button.H ../src/flstring.h ../FL/Fl_Export.H -template_panel.o: ../config.h ../FL/filename.H ../FL/fl_ask.H -template_panel.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H -template_panel.o: ../FL/Fl_Preferences.H -undo.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h -undo.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H -undo.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h -undo.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H -undo.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H -undo.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H -undo.o: ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H -undo.o: ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H undo.h -undo.o: ../FL/Fl_Preferences.H ../src/flstring.h ../FL/Fl_Export.H -undo.o: ../config.h -widget_panel.o: widget_panel.h ../FL/Fl.H ../FL/Enumerations.H -widget_panel.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H -widget_panel.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Tabs.H -widget_panel.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -widget_panel.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H -widget_panel.o: ../FL/Fl_Image.H ../FL/Fl_Button.H ../FL/Fl_Box.H -widget_panel.o: ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H ../FL/Fl_Input.H -widget_panel.o: ../FL/Fl_Light_Button.H Shortcut_Button.h CodeEditor.h -widget_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H -widget_panel.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Scrollbar.H -widget_panel.o: ../FL/Fl_Slider.H ../FL/Fl_Text_Buffer.H -widget_panel.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H +# DO NOT DELETE THIS LINE -- make depend depends on it. +CodeEditor.o: CodeEditor.cxx CodeEditor.h ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H \ + ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Group.H \ + ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H +Fl_Function_Type.o: Fl_Function_Type.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/Fl_Preferences.H ../FL/Fl_File_Chooser.H \ + ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H \ + ../FL/Fl_Widget.H ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/Fl_Menu_Button.H \ + ../FL/Fl_Button.H ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H \ + ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H \ + ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H \ + ../FL/filename.H ../FL/Fl_Box.H ../FL/Fl_Check_Button.H \ + ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_File_Input.H \ + ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H \ + ../FL/fl_ask.H Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H \ + Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H \ + ../FL/fl_show_input.H ../FL/fl_ask.H ../src/flstring.h \ + ../FL/Fl_Export.H ../config.h function_panel.h ../FL/Fl_Light_Button.H \ + CodeEditor.h ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H \ + ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Text_Buffer.H \ + comments.h +Fl_Group_Type.o: Fl_Group_Type.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/fl_message.H \ + ../FL/fl_ask.H Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H \ + ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H ../src/flstring.h \ + ../FL/Fl_Export.H ../config.h ../FL/Fl_Scroll.H ../FL/Fl_Scrollbar.H \ + ../FL/Fl_Slider.H ../FL/Fl_Valuator.H +Fl_Menu_Type.o: Fl_Menu_Type.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H \ + ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H \ + Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H \ + ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H \ + alignment_panel.h ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H \ + ../FL/fl_draw.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H \ + ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Button.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Spinner.H ../FL/Enumerations.H ../FL/Fl_Repeat_Button.H \ + ../FL/Fl.H ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H \ + ../FL/fl_message.H ../FL/fl_ask.H ../src/flstring.h ../FL/Fl_Export.H \ + ../config.h ../FL/Fl_Output.H ../FL/Fl_Input.H Shortcut_Button.h +Fl_Type.o: Fl_Type.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H \ + ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Widget.H \ + ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H \ + ../FL/fl_draw.H ../src/flstring.h ../FL/Fl_Export.H ../config.h \ + Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H \ + ../FL/Fl_Image.H Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H undo.h ../FL/Fl_Pixmap.H \ + pixmaps/lock.xpm pixmaps/flWindow.xpm pixmaps/flButton.xpm \ + pixmaps/flCheckButton.xpm pixmaps/flRoundButton.xpm pixmaps/flBox.xpm \ + pixmaps/flGroup.xpm pixmaps/flFunction.xpm pixmaps/flCode.xpm \ + pixmaps/flCodeBlock.xpm pixmaps/flComment.xpm pixmaps/flDeclaration.xpm \ + pixmaps/flDeclarationBlock.xpm pixmaps/flClass.xpm pixmaps/flTabs.xpm \ + pixmaps/flInput.xpm pixmaps/flChoice.xpm pixmaps/flMenuitem.xpm \ + pixmaps/flMenubar.xpm pixmaps/flSubmenu.xpm pixmaps/flScroll.xpm \ + pixmaps/flTile.xpm pixmaps/flWizard.xpm pixmaps/flPack.xpm \ + pixmaps/flReturnButton.xpm pixmaps/flLightButton.xpm \ + pixmaps/flRepeatButton.xpm pixmaps/flMenuButton.xpm \ + pixmaps/flOutput.xpm pixmaps/flTextDisplay.xpm pixmaps/flTextEdit.xpm \ + pixmaps/flFileInput.xpm pixmaps/flBrowser.xpm \ + pixmaps/flCheckBrowser.xpm pixmaps/flFileBrowser.xpm \ + pixmaps/flClock.xpm pixmaps/flHelp.xpm pixmaps/flProgress.xpm \ + pixmaps/flSlider.xpm pixmaps/flScrollBar.xpm pixmaps/flValueSlider.xpm \ + pixmaps/flAdjuster.xpm pixmaps/flCounter.xpm pixmaps/flDial.xpm \ + pixmaps/flRoller.xpm pixmaps/flValueInput.xpm pixmaps/flValueOutput.xpm \ + pixmaps/flSpinner.xpm pixmaps/flWidgetClass.xpm +Fl_Widget_Type.o: Fl_Widget_Type.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Input.H \ + ../FL/Fl_Input_.H Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H \ + ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H \ + alignment_panel.h ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H \ + ../FL/fl_draw.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H \ + ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Button.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Spinner.H ../FL/Enumerations.H ../FL/Fl_Repeat_Button.H \ + ../FL/Fl.H ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H \ + ../FL/fl_message.H ../FL/fl_ask.H ../FL/Fl_Slider.H ../src/flstring.h \ + ../FL/Fl_Export.H ../config.h widget_panel.h ../FL/Fl_Value_Input.H \ + ../FL/Fl_Input.H Shortcut_Button.h CodeEditor.h ../FL/Fl_Text_Editor.H \ + ../FL/Fl_Text_Display.H ../FL/fl_show_colormap.H +Fl_Window_Type.o: Fl_Window_Type.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/fl_message.H \ + ../FL/fl_ask.H ../FL/fl_draw.H ../FL/x.H ../FL/Fl_Menu_Item.H \ + ../FL/Fl_Image.H ../FL/Fl_Round_Button.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Button.H Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H \ + ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H \ + ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H undo.h alignment_panel.h \ + ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H \ + ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H \ + ../FL/Fl_Text_Buffer.H ../FL/Fl_Double_Window.H ../FL/Fl_Preferences.H \ + ../FL/Fl_Tooltip.H ../FL/Fl_Button.H ../FL/Fl_Box.H \ + ../FL/Fl_Light_Button.H ../FL/Fl_Check_Button.H ../FL/Fl_Spinner.H \ + ../FL/Enumerations.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H \ + ../FL/Fl_Return_Button.H widget_panel.h ../FL/Fl_Value_Input.H \ + ../FL/Fl_Input.H Shortcut_Button.h CodeEditor.h ../FL/Fl_Text_Editor.H \ + ../FL/Fl_Text_Display.H ../src/flstring.h ../FL/Fl_Export.H ../config.h +Fluid_Image.o: Fluid_Image.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/Fl_Widget.H Fl_Type.h ../FL/Fl_Menu.H \ + ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H \ + ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H \ + ../src/flstring.h ../FL/Fl_Export.H ../config.h ../FL/filename.H \ + ../FL/Fl_File_Chooser.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H \ + ../FL/Fl_Button.H ../FL/Fl_Preferences.H ../FL/Fl_Tile.H \ + ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H \ + ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H \ + ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H ../FL/Fl_Box.H \ + ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H \ + ../FL/Fl_File_Input.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H +about_panel.o: about_panel.cxx about_panel.h ../FL/Fl.H \ + ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H \ + ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H \ + ../FL/Fl_Pixmap.H ../FL/Fl_Image.H +align_widget.o: align_widget.cxx ../FL/Fl.H ../FL/Enumerations.H \ + ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H \ + Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H \ + ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H \ + ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Menu_Bar.H undo.h +alignment_panel.o: alignment_panel.cxx alignment_panel.h ../FL/Fl.H \ + ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Text_Buffer.H \ + ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Group.H \ + ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H \ + ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H \ + ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Choice.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H \ + ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Spinner.H \ + ../FL/Enumerations.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H \ + ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H +code.o: code.cxx ../src/flstring.h ../FL/Fl_Export.H ../config.h \ + ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h \ + ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H \ + ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H \ + ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H \ + alignment_panel.h ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H \ + ../FL/fl_draw.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H \ + ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Button.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Spinner.H ../FL/Enumerations.H ../FL/Fl_Repeat_Button.H \ + ../FL/Fl.H ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H \ + ../FL/filename.H +factory.o: factory.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H \ + ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H \ + ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../src/flstring.h ../FL/Fl_Export.H \ + ../config.h undo.h Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H \ + ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Box.H ../FL/Fl_Button.H \ + ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Repeat_Button.H \ + ../FL/Fl.H ../FL/Fl_Light_Button.H ../FL/Fl_Check_Button.H \ + ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H ../FL/Fl_Browser.H \ + ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Check_Browser.H ../FL/Fl_File_Browser.H \ + ../FL/Fl_Browser.H ../FL/Fl_File_Icon.H ../FL/filename.H \ + ../FL/Fl_Counter.H ../FL/Fl_Spinner.H ../FL/Enumerations.H \ + ../FL/Fl_File_Input.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H \ + ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H \ + ../FL/Fl_Clock.H ../FL/Fl_Help_View.H ../FL/Fl_Shared_Image.H \ + ../FL/Fl_Progress.H ../FL/Fl_Adjuster.H ../FL/Fl_Dial.H \ + ../FL/Fl_Roller.H ../FL/Fl_Scrollbar.H ../FL/Fl_Output.H \ + ../FL/Fl_Input.H ../FL/Fl_Value_Input.H ../FL/Fl_Value_Output.H \ + ../FL/Fl_Value_Slider.H ../FL/Fl_Multi_Label.H +file.o: file.cxx ../src/flstring.h ../FL/Fl_Export.H ../config.h \ + alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H \ + ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H \ + ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Scrollbar.H \ + ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H \ + ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Preferences.H \ + ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Choice.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H \ + ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Spinner.H \ + ../FL/Enumerations.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H \ + ../FL/Fl_Return_Button.H ../FL/Fl_Round_Button.H ../FL/fl_message.H \ + ../FL/fl_ask.H Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Menu.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Pack.H \ + ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H +fluid.o: fluid.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H \ + ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H \ + ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Button.H ../FL/Fl_File_Icon.H \ + ../FL/Fl.H ../FL/Fl_Help_Dialog.H ../FL/Fl_Group.H ../FL/Fl_Input.H \ + ../FL/Fl_Input_.H ../FL/Fl_Help_View.H ../FL/Fl_Scrollbar.H \ + ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H \ + ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/Fl_Hold_Browser.H \ + ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Menu_Bar.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/fl_ask.H ../FL/fl_draw.H \ + ../FL/Fl_File_Chooser.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H \ + ../FL/Fl_Preferences.H ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H \ + ../FL/Fl_File_Icon.H ../FL/filename.H ../FL/Fl_Check_Button.H \ + ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_File_Input.H \ + ../FL/Fl_Return_Button.H ../FL/fl_message.H ../FL/fl_ask.H \ + ../FL/filename.H ../src/flstring.h ../FL/Fl_Export.H ../config.h \ + alignment_panel.h ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Display.H \ + ../FL/Fl_Text_Buffer.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H \ + ../FL/Fl_Tabs.H ../FL/Fl_Light_Button.H ../FL/Fl_Spinner.H \ + ../FL/Enumerations.H ../FL/Fl_Repeat_Button.H ../FL/Fl_Round_Button.H \ + function_panel.h CodeEditor.h ../FL/Fl_Text_Editor.H \ + ../FL/Fl_Text_Display.H ../FL/Fl_Window.H template_panel.h \ + ../FL/Fl_Browser.H print_panel.cxx print_panel.h ../FL/Fl_Progress.H \ + ../FL/Fl_Pixmap.H about_panel.h undo.h Fl_Type.h ../FL/Fl_Menu.H \ + Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Input_Choice.H +function_panel.o: function_panel.cxx function_panel.h ../FL/Fl.H \ + ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Group.H \ + ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Box.H \ + ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H \ + ../FL/Fl_Button.H CodeEditor.h ../FL/Fl_Text_Buffer.H \ + ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H \ + ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H \ + ../FL/Fl_Text_Buffer.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/Fl_Window.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Pixmap.H Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H \ + Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Pack.H \ + ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Input_Choice.H ../FL/Fl_Menu_Bar.H undo.h +template_panel.o: template_panel.cxx template_panel.h ../FL/Fl.H \ + ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Browser.H \ + ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H \ + ../FL/Fl_Group.H ../FL/Fl_Button.H ../FL/Fl_Return_Button.H \ + ../FL/Fl_Button.H ../src/flstring.h ../FL/Fl_Export.H ../config.h \ + ../FL/filename.H ../FL/fl_ask.H ../FL/Fl_Shared_Image.H \ + ../FL/Fl_Image.H ../FL/Fl_Preferences.H +undo.o: undo.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H \ + Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H \ + ../FL/Fl_Widget.H ../FL/Fl_Image.H Fluid_Image.h \ + ../FL/Fl_Shared_Image.H ../FL/fl_draw.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H \ + ../FL/Fl_Choice.H ../FL/Fl_Input_Choice.H ../FL/Fl_Input.H \ + ../FL/Fl_Input_.H ../FL/Fl_Window.H ../FL/Fl_Menu_Bar.H undo.h \ + ../FL/Fl_Preferences.H ../src/flstring.h ../FL/Fl_Export.H ../config.h +widget_panel.o: widget_panel.cxx widget_panel.h ../FL/Fl.H \ + ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Double_Window.H \ + ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Tabs.H \ + ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H \ + ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H \ + ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Value_Input.H \ + ../FL/Fl_Valuator.H ../FL/Fl_Input.H ../FL/Fl_Light_Button.H \ + ../FL/Fl_Button.H Shortcut_Button.h CodeEditor.h ../FL/Fl_Text_Buffer.H \ + ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H \ + ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Text_Buffer.H \ + ../FL/Fl_Return_Button.H diff --git a/fluid/makefile.wat b/fluid/makefile.wat index 8a1a5d9..436038f 100644 --- a/fluid/makefile.wat +++ b/fluid/makefile.wat @@ -1,5 +1,5 @@ #
-# "$Id: makefile.wat 4359 2005-05-19 16:07:13Z mike $"
+# "$Id: makefile.wat 5699 2007-02-20 17:02:41Z matt $"
#
# FLUID makefile for the Fast Light Tool Kit (FLTK).
#
@@ -24,21 +24,24 @@ #
OBJECTS = &
+ CodeEditor.obj &
Fl_Function_Type.obj &
- Fl_Menu_Type.obj &
Fl_Group_Type.obj &
- Fl_Widget_Type.obj &
+ Fl_Menu_Type.obj &
Fl_Type.obj &
+ Fl_Widget_Type.obj &
Fl_Window_Type.obj &
Fluid_Image.obj &
+ about_panel.obj &
+ align_widget.obj &
+ alignment_panel.obj &
code.obj &
factory.obj &
file.obj &
- align_widget.obj &
- about_panel.obj &
- widget_panel.obj &
- alignment_panel.obj &
- function_panel.obj
+ function_panel.obj &
+ template_panel.obj &
+ undo.obj &
+ widget_panel.obj
# fluid.obj should not be in the list, because the watcom.mif file
# assumes an object file with the same name as the target executable
@@ -72,5 +75,5 @@ rebuild: ./fluid -c widget_panel.fl
#
-# End of "$Id: makefile.wat 4359 2005-05-19 16:07:13Z mike $".
+# End of "$Id: makefile.wat 5699 2007-02-20 17:02:41Z matt $".
#
diff --git a/fluid/pixmaps/.cvsignore b/fluid/pixmaps/.cvsignore deleted file mode 100644 index 3df5b20..0000000 --- a/fluid/pixmaps/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.bck diff --git a/fluid/undo.cxx b/fluid/undo.cxx index e23b6ca..1b88eea 100644 --- a/fluid/undo.cxx +++ b/fluid/undo.cxx @@ -3,7 +3,7 @@ // // FLUID undo support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2007 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,9 +34,11 @@ # include <io.h> # include <windows.h> # define getpid (int)GetCurrentProcessId +# ifndef __WATCOMC__ // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs // on Windows, which is supposed to be POSIX compliant... -# define unlink _unlink +# define unlink _unlink +# endif // !__WATCOMC__ #else # include <unistd.h> #endif // WIN32 && !__CYGWIN__ @@ -124,6 +126,7 @@ void undo_cb(Fl_Widget *, void *) { // Update undo/redo menu items... if (undo_current <= 0) Main_Menu[UNDO_ITEM].deactivate(); Main_Menu[REDO_ITEM].activate(); + undo_resume(); } // Save current file to undo buffer diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx index 395504d..ab06ee2 100644 --- a/fluid/widget_panel.cxx +++ b/fluid/widget_panel.cxx @@ -1,5 +1,5 @@ // -// "$Id: widget_panel.cxx 4625 2005-11-02 13:55:13Z matt $" +// "$Id: widget_panel.cxx 5438 2006-09-17 14:58:25Z mike $" // // Widget panel for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #include "widget_panel.h" @@ -47,26 +47,27 @@ Fl_Button *wLiveMode=(Fl_Button *)0; Fl_Double_Window* make_widget_panel() { Fl_Double_Window* w; - { Fl_Double_Window* o = new Fl_Double_Window(410, 355); + { Fl_Double_Window* o = new Fl_Double_Window(420, 360); w = o; o->labelsize(11); - w->hotspot(o); - { Fl_Tabs* o = new Fl_Tabs(5, 5, 400, 310); - o->selection_color((Fl_Color)4); + o->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE); + o->hotspot(o); + { Fl_Tabs* o = new Fl_Tabs(10, 10, 400, 310); + o->selection_color((Fl_Color)12); o->labelsize(11); o->labelcolor(FL_BACKGROUND2_COLOR); o->callback((Fl_Callback*)cb_); o->when(FL_WHEN_NEVER); - { Fl_Group* o = new Fl_Group(5, 25, 400, 290, "GUI"); + { Fl_Group* o = new Fl_Group(10, 30, 400, 290, "GUI"); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->when(FL_WHEN_NEVER); - { Fl_Group* o = new Fl_Group(90, 35, 300, 20, "Label:"); + { Fl_Group* o = new Fl_Group(95, 40, 309, 20, "Label:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 35, 180, 20); + { Fl_Input* o = new Fl_Input(95, 40, 190, 20); o->tooltip("The label text for the widget."); o->labelfont(1); o->labelsize(11); @@ -74,8 +75,8 @@ Fl_Double_Window* make_widget_panel() { o->callback((Fl_Callback*)label_cb); o->when(FL_WHEN_CHANGED); Fl_Group::current()->resizable(o); - } - { Fl_Choice* o = new Fl_Choice(270, 35, 120, 20); + } // Fl_Input* o + { Fl_Choice* o = new Fl_Choice(284, 40, 120, 20); o->tooltip("The label style for the widget."); o->box(FL_THIN_UP_BOX); o->down_box(FL_BORDER_BOX); @@ -84,228 +85,228 @@ Fl_Double_Window* make_widget_panel() { o->textsize(11); o->callback((Fl_Callback*)labeltype_cb); o->menu(labeltypemenu); - } + } // Fl_Choice* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 60, 300, 20, "Image:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 65, 309, 20, "Image:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 60, 230, 20); + { Fl_Input* o = new Fl_Input(95, 65, 240, 20); o->tooltip("The active image for the widget."); o->labelfont(1); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)image_cb); Fl_Group::current()->resizable(o); - } - { Fl_Button* o = new Fl_Button(320, 60, 70, 20, "Browse..."); + } // Fl_Input* o + { Fl_Button* o = new Fl_Button(334, 65, 70, 20, "Browse..."); o->tooltip("Click to choose the active image."); o->labelsize(11); o->callback((Fl_Callback*)image_browse_cb); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 85, 300, 20, "Inactive:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 90, 309, 20, "Inactive:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 85, 230, 20); + { Fl_Input* o = new Fl_Input(95, 90, 240, 20); o->tooltip("The inactive image for the widget."); o->labelfont(1); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)inactive_cb); Fl_Group::current()->resizable(o); - } - { Fl_Button* o = new Fl_Button(320, 85, 70, 20, "Browse..."); + } // Fl_Input* o + { Fl_Button* o = new Fl_Button(334, 90, 70, 20, "Browse..."); o->tooltip("Click to choose the inactive image."); o->labelsize(11); o->callback((Fl_Callback*)inactive_browse_cb); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 110, 300, 20, "Alignment:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 115, 300, 20, "Alignment:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Button* o = new Fl_Button(90, 110, 45, 20, "Clip"); + { Fl_Button* o = new Fl_Button(95, 115, 45, 20, "Clip"); o->tooltip("Clip the label to the inside of the widget."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_CLIP)); o->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE); - } - { Fl_Button* o = new Fl_Button(140, 110, 50, 20, "Wrap"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(145, 115, 50, 20, "Wrap"); o->tooltip("Wrap the label text."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_WRAP)); - } - { Fl_Button* o = new Fl_Button(195, 110, 65, 20, "Text/Image"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(200, 115, 65, 20, "Text/Image"); o->tooltip("Show the label text over the image."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TEXT_OVER_IMAGE)); - } - { Fl_Button* o = new Fl_Button(265, 110, 20, 20, "@-1<-"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(270, 115, 20, 20, "@-1<-"); o->tooltip("Left-align the label."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->labelcolor(FL_INACTIVE_COLOR); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_LEFT)); - } - { Fl_Button* o = new Fl_Button(290, 110, 20, 20, "@-1->"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(295, 115, 20, 20, "@-1->"); o->tooltip("Right-align the label."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->labelcolor(FL_INACTIVE_COLOR); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_RIGHT)); - } - { Fl_Button* o = new Fl_Button(315, 110, 20, 20, "@-18"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(320, 115, 20, 20, "@-18"); o->tooltip("Top-align the label."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->labelcolor(FL_INACTIVE_COLOR); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_TOP)); - } - { Fl_Button* o = new Fl_Button(340, 110, 20, 20, "@-12"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(345, 115, 20, 20, "@-12"); o->tooltip("Bottom-align the label."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->labelcolor(FL_INACTIVE_COLOR); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_BOTTOM)); - } - { Fl_Button* o = new Fl_Button(365, 110, 20, 20, "@-3square"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(370, 115, 20, 20, "@-3square"); o->tooltip("Show the label inside the widget."); o->type(1); o->selection_color(FL_INACTIVE_COLOR); o->labelsize(11); o->labelcolor(FL_INACTIVE_COLOR); o->callback((Fl_Callback*)align_cb, (void*)(FL_ALIGN_INSIDE)); - } - { Fl_Box* o = new Fl_Box(390, 110, 0, 20); + } // Fl_Button* o + { Fl_Box* o = new Fl_Box(395, 115, 0, 20); o->labelsize(11); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 145, 300, 20, "Position:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 150, 300, 20, "Position:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Value_Input* o = widget_x_input = new Fl_Value_Input(90, 145, 55, 20, "X:"); - o->tooltip("The X position of the widget."); - o->labelsize(11); - o->maximum(2048); - o->step(1); - o->textsize(11); - o->callback((Fl_Callback*)x_cb); - o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = widget_y_input = new Fl_Value_Input(150, 145, 55, 20, "Y:"); - o->tooltip("The Y position of the widget."); - o->labelsize(11); - o->maximum(2048); - o->step(1); - o->textsize(11); - o->callback((Fl_Callback*)y_cb); - o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = widget_w_input = new Fl_Value_Input(210, 145, 55, 20, "Width:"); - o->tooltip("The width of the widget."); - o->labelsize(11); - o->maximum(2048); - o->step(1); - o->textsize(11); - o->callback((Fl_Callback*)w_cb); - o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = widget_h_input = new Fl_Value_Input(270, 145, 55, 20, "Height:"); - o->tooltip("The height of the widget."); - o->labelsize(11); - o->maximum(2048); - o->step(1); - o->textsize(11); - o->callback((Fl_Callback*)h_cb); - o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Light_Button* o = new Fl_Light_Button(330, 145, 55, 20, "Relative"); + { widget_x_input = new Fl_Value_Input(95, 150, 55, 20, "X:"); + widget_x_input->tooltip("The X position of the widget."); + widget_x_input->labelsize(11); + widget_x_input->maximum(2048); + widget_x_input->step(1); + widget_x_input->textsize(11); + widget_x_input->callback((Fl_Callback*)x_cb); + widget_x_input->align(FL_ALIGN_TOP_LEFT); + } // Fl_Value_Input* widget_x_input + { widget_y_input = new Fl_Value_Input(155, 150, 55, 20, "Y:"); + widget_y_input->tooltip("The Y position of the widget."); + widget_y_input->labelsize(11); + widget_y_input->maximum(2048); + widget_y_input->step(1); + widget_y_input->textsize(11); + widget_y_input->callback((Fl_Callback*)y_cb); + widget_y_input->align(FL_ALIGN_TOP_LEFT); + } // Fl_Value_Input* widget_y_input + { widget_w_input = new Fl_Value_Input(215, 150, 55, 20, "Width:"); + widget_w_input->tooltip("The width of the widget."); + widget_w_input->labelsize(11); + widget_w_input->maximum(2048); + widget_w_input->step(1); + widget_w_input->textsize(11); + widget_w_input->callback((Fl_Callback*)w_cb); + widget_w_input->align(FL_ALIGN_TOP_LEFT); + } // Fl_Value_Input* widget_w_input + { widget_h_input = new Fl_Value_Input(275, 150, 55, 20, "Height:"); + widget_h_input->tooltip("The height of the widget."); + widget_h_input->labelsize(11); + widget_h_input->maximum(2048); + widget_h_input->step(1); + widget_h_input->textsize(11); + widget_h_input->callback((Fl_Callback*)h_cb); + widget_h_input->align(FL_ALIGN_TOP_LEFT); + } // Fl_Value_Input* widget_h_input + { Fl_Light_Button* o = new Fl_Light_Button(335, 150, 55, 20, "Relative"); o->tooltip("If set, widgets inside a widget class of type Fl_Group are repositioned relat\ ive to the origin at construction time"); o->labelsize(11); o->callback((Fl_Callback*)wc_relative_cb); - } - { Fl_Box* o = new Fl_Box(389, 145, 1, 20); + } // Fl_Light_Button* o + { Fl_Box* o = new Fl_Box(394, 150, 1, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 180, 300, 20, "Values:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 185, 300, 20, "Values:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Value_Input* o = new Fl_Value_Input(90, 180, 55, 20, "Size:"); + { Fl_Value_Input* o = new Fl_Value_Input(95, 185, 55, 20, "Size:"); o->tooltip("The size of the slider."); o->labelsize(11); o->step(0.010101); o->textsize(11); o->callback((Fl_Callback*)slider_size_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = new Fl_Value_Input(150, 180, 55, 20, "Minimum:"); + } // Fl_Value_Input* o + { Fl_Value_Input* o = new Fl_Value_Input(155, 185, 55, 20, "Minimum:"); o->tooltip("The minimum value of the widget."); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)min_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = new Fl_Value_Input(210, 180, 55, 20, "Maximum:"); + } // Fl_Value_Input* o + { Fl_Value_Input* o = new Fl_Value_Input(215, 185, 55, 20, "Maximum:"); o->tooltip("The maximum value of the widget."); o->labelsize(11); o->value(1); o->textsize(11); o->callback((Fl_Callback*)max_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = new Fl_Value_Input(270, 180, 55, 20, "Step:"); + } // Fl_Value_Input* o + { Fl_Value_Input* o = new Fl_Value_Input(275, 185, 55, 20, "Step:"); o->tooltip("The resolution of the widget value."); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)step_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = new Fl_Value_Input(330, 180, 55, 20, "Value:"); + } // Fl_Value_Input* o + { Fl_Value_Input* o = new Fl_Value_Input(335, 185, 55, 20, "Value:"); o->tooltip("The current widget value."); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)value_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Box* o = new Fl_Box(390, 180, 0, 20); + } // Fl_Value_Input* o + { Fl_Box* o = new Fl_Box(395, 185, 0, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 180, 300, 20, "Size Range:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 185, 300, 20, "Size Range:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); o->hide(); - { Fl_Value_Input* o = new Fl_Value_Input(90, 180, 55, 20, "Minimum Size:"); + { Fl_Value_Input* o = new Fl_Value_Input(95, 185, 55, 20, "Minimum Size:"); o->tooltip("The size of the slider."); o->labelsize(11); o->maximum(2048); @@ -313,8 +314,8 @@ ive to the origin at construction time"); o->textsize(11); o->callback((Fl_Callback*)min_w_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = new Fl_Value_Input(150, 180, 55, 20); + } // Fl_Value_Input* o + { Fl_Value_Input* o = new Fl_Value_Input(155, 185, 55, 20); o->tooltip("The minimum value of the widget."); o->labelsize(11); o->maximum(2048); @@ -322,12 +323,12 @@ ive to the origin at construction time"); o->textsize(11); o->callback((Fl_Callback*)min_h_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Button* o = new Fl_Button(210, 180, 25, 20, "set"); + } // Fl_Value_Input* o + { Fl_Button* o = new Fl_Button(215, 185, 25, 20, "set"); o->labelsize(11); o->callback((Fl_Callback*)set_min_size_cb); - } - { Fl_Value_Input* o = new Fl_Value_Input(240, 180, 55, 20, "Maximum Size:"); + } // Fl_Button* o + { Fl_Value_Input* o = new Fl_Value_Input(245, 185, 55, 20, "Maximum Size:"); o->tooltip("The maximum value of the widget."); o->labelsize(11); o->maximum(2048); @@ -335,8 +336,8 @@ ive to the origin at construction time"); o->textsize(11); o->callback((Fl_Callback*)max_w_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Value_Input* o = new Fl_Value_Input(300, 180, 55, 20); + } // Fl_Value_Input* o + { Fl_Value_Input* o = new Fl_Value_Input(305, 185, 55, 20); o->tooltip("The resolution of the widget value."); o->labelsize(11); o->maximum(2048); @@ -344,17 +345,17 @@ ive to the origin at construction time"); o->textsize(11); o->callback((Fl_Callback*)max_h_cb); o->align(FL_ALIGN_TOP_LEFT); - } - { Fl_Button* o = new Fl_Button(360, 180, 25, 20, "set"); + } // Fl_Value_Input* o + { Fl_Button* o = new Fl_Button(365, 185, 25, 20, "set"); o->labelsize(11); o->callback((Fl_Callback*)set_max_size_cb); - } - { Fl_Box* o = new Fl_Box(390, 180, 0, 20); + } // Fl_Button* o + { Fl_Box* o = new Fl_Box(395, 185, 0, 20); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Shortcut_Button* o = new Shortcut_Button(90, 205, 300, 20, "Shortcut:"); + } // Fl_Group* o + { Shortcut_Button* o = new Shortcut_Button(95, 210, 310, 20, "Shortcut:"); o->tooltip("The shortcut key for the widget."); o->box(FL_DOWN_BOX); o->color(FL_BACKGROUND2_COLOR); @@ -366,103 +367,103 @@ ive to the origin at construction time"); o->callback((Fl_Callback*)shortcut_in_cb); o->align(FL_ALIGN_LEFT); o->when(FL_WHEN_RELEASE); - } - { Fl_Group* o = new Fl_Group(90, 230, 300, 20, "X Class:"); + } // Shortcut_Button* o + { Fl_Group* o = new Fl_Group(95, 235, 300, 20, "X Class:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 230, 95, 20, ":"); + { Fl_Input* o = new Fl_Input(95, 235, 95, 20, ":"); o->tooltip("The X resource class."); o->labelfont(1); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)xclass_cb); Fl_Group::current()->resizable(o); - } - { Fl_Light_Button* o = new Fl_Light_Button(190, 230, 60, 20, "Border"); + } // Fl_Input* o + { Fl_Light_Button* o = new Fl_Light_Button(195, 235, 60, 20, "Border"); o->tooltip("Add a border around the window."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)border_cb); - } - { Fl_Light_Button* o = new Fl_Light_Button(255, 230, 55, 20, "Modal"); + } // Fl_Light_Button* o + { Fl_Light_Button* o = new Fl_Light_Button(260, 235, 55, 20, "Modal"); o->tooltip("Make the window modal."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)modal_cb); - } - { Fl_Light_Button* o = new Fl_Light_Button(315, 230, 75, 20, "Nonmodal"); + } // Fl_Light_Button* o + { Fl_Light_Button* o = new Fl_Light_Button(320, 235, 75, 20, "Nonmodal"); o->tooltip("Make the window non-modal."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)non_modal_cb); o->align(132|FL_ALIGN_INSIDE); - } + } // Fl_Light_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 255, 305, 20, "Attributes:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 260, 305, 20, "Attributes:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Light_Button* o = new Fl_Light_Button(90, 255, 60, 20, "Visible"); + { Fl_Light_Button* o = new Fl_Light_Button(95, 260, 60, 20, "Visible"); o->tooltip("Show the widget."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)visible_cb); - } - { Fl_Light_Button* o = new Fl_Light_Button(155, 255, 60, 20, "Active"); + } // Fl_Light_Button* o + { Fl_Light_Button* o = new Fl_Light_Button(160, 260, 60, 20, "Active"); o->tooltip("Activate the widget."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)active_cb); - } - { Fl_Light_Button* o = new Fl_Light_Button(220, 255, 75, 20, "Resizable"); + } // Fl_Light_Button* o + { Fl_Light_Button* o = new Fl_Light_Button(225, 260, 75, 20, "Resizable"); o->tooltip("Make the widget resizable."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)resizable_cb); o->when(FL_WHEN_CHANGED); - } - { Fl_Light_Button* o = new Fl_Light_Button(300, 255, 70, 20, "Hotspot"); + } // Fl_Light_Button* o + { Fl_Light_Button* o = new Fl_Light_Button(305, 260, 70, 20, "Hotspot"); o->tooltip("Center the window under this widget."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)hotspot_cb); o->when(FL_WHEN_CHANGED); - } - { Fl_Box* o = new Fl_Box(390, 255, 0, 20); + } // Fl_Light_Button* o + { Fl_Box* o = new Fl_Box(395, 260, 0, 20); o->labelsize(11); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Input* o = new Fl_Input(90, 280, 300, 20, "Tooltip:"); + } // Fl_Group* o + { Fl_Input* o = new Fl_Input(95, 285, 310, 20, "Tooltip:"); o->tooltip("The tooltip text for the widget."); o->labelfont(1); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)tooltip_cb); - } - { Fl_Box* o = new Fl_Box(90, 300, 300, 5); + } // Fl_Input* o + { Fl_Box* o = new Fl_Box(95, 305, 300, 5); o->labelsize(11); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); Fl_Group::current()->resizable(o); - } - { Fl_Group* o = new Fl_Group(5, 25, 400, 290, "Style"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(10, 30, 400, 290, "Style"); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->when(FL_WHEN_NEVER); o->hide(); - { Fl_Group* o = new Fl_Group(90, 35, 300, 20, "Label Font:"); + { Fl_Group* o = new Fl_Group(95, 40, 309, 20, "Label Font:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Choice* o = new Fl_Choice(90, 35, 160, 20); + { Fl_Choice* o = new Fl_Choice(95, 40, 170, 20); o->tooltip("The style of the label text."); o->box(FL_THIN_UP_BOX); o->down_box(FL_BORDER_BOX); @@ -471,8 +472,8 @@ ive to the origin at construction time"); o->callback((Fl_Callback*)labelfont_cb); Fl_Group::current()->resizable(o); o->menu(fontmenu); - } - { Fl_Value_Input* o = new Fl_Value_Input(250, 35, 50, 20); + } // Fl_Choice* o + { Fl_Value_Input* o = new Fl_Value_Input(264, 40, 50, 20); o->tooltip("The size of the label text."); o->labelsize(11); o->maximum(100); @@ -480,20 +481,20 @@ ive to the origin at construction time"); o->value(14); o->textsize(11); o->callback((Fl_Callback*)labelsize_cb); - } - { Fl_Button* o = new Fl_Button(300, 35, 90, 20, "Label Color"); + } // Fl_Value_Input* o + { Fl_Button* o = new Fl_Button(314, 40, 90, 20, "Label Color"); o->tooltip("The color of the label text."); o->labelsize(11); o->callback((Fl_Callback*)labelcolor_cb); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 60, 300, 20, "Box:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 65, 309, 20, "Box:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Choice* o = new Fl_Choice(90, 60, 210, 20); + { Fl_Choice* o = new Fl_Choice(95, 65, 219, 20); o->tooltip("The \"up\" box of the widget."); o->box(FL_THIN_UP_BOX); o->down_box(FL_BORDER_BOX); @@ -502,20 +503,20 @@ ive to the origin at construction time"); o->callback((Fl_Callback*)box_cb); Fl_Group::current()->resizable(o); o->menu(boxmenu); - } - { Fl_Button* o = new Fl_Button(300, 60, 90, 20, "Color"); + } // Fl_Choice* o + { Fl_Button* o = new Fl_Button(314, 65, 90, 20, "Color"); o->tooltip("The background color of the widget."); o->labelsize(11); o->callback((Fl_Callback*)color_cb); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 85, 300, 20, "Down Box:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 90, 309, 20, "Down Box:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Choice* o = new Fl_Choice(90, 85, 210, 20); + { Fl_Choice* o = new Fl_Choice(95, 90, 219, 20); o->tooltip("The \"down\" box of the widget."); o->box(FL_THIN_UP_BOX); o->down_box(FL_BORDER_BOX); @@ -524,20 +525,20 @@ ive to the origin at construction time"); o->callback((Fl_Callback*)down_box_cb); Fl_Group::current()->resizable(o); o->menu(boxmenu); - } - { Fl_Button* o = new Fl_Button(300, 85, 90, 20, "Select Color"); + } // Fl_Choice* o + { Fl_Button* o = new Fl_Button(314, 90, 90, 20, "Select Color"); o->tooltip("The selection color of the widget."); o->labelsize(11); o->callback((Fl_Callback*)color2_cb); - } + } // Fl_Button* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 110, 300, 20, "Text Font:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 115, 309, 20, "Text Font:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Choice* o = new Fl_Choice(90, 110, 160, 20); + { Fl_Choice* o = new Fl_Choice(95, 115, 170, 20); o->tooltip("The value text style."); o->box(FL_DOWN_BOX); o->down_box(FL_BORDER_BOX); @@ -546,8 +547,8 @@ ive to the origin at construction time"); o->callback((Fl_Callback*)textfont_cb); Fl_Group::current()->resizable(o); o->menu(fontmenu); - } - { Fl_Value_Input* o = new Fl_Value_Input(250, 110, 50, 20); + } // Fl_Choice* o + { Fl_Value_Input* o = new Fl_Value_Input(264, 115, 50, 20); o->tooltip("The value text size."); o->labelsize(11); o->maximum(100); @@ -555,31 +556,31 @@ ive to the origin at construction time"); o->value(14); o->textsize(11); o->callback((Fl_Callback*)textsize_cb); - } - { Fl_Button* o = new Fl_Button(300, 110, 90, 20, "Text Color"); + } // Fl_Value_Input* o + { Fl_Button* o = new Fl_Button(314, 115, 90, 20, "Text Color"); o->tooltip("The value text color."); o->labelsize(11); o->callback((Fl_Callback*)textcolor_cb); - } + } // Fl_Button* o o->end(); - } - { Fl_Box* o = new Fl_Box(90, 135, 300, 40); + } // Fl_Group* o + { Fl_Box* o = new Fl_Box(95, 140, 300, 40); o->labelsize(11); Fl_Group::current()->resizable(o); - } + } // Fl_Box* o o->end(); - } - { Fl_Group* o = new Fl_Group(5, 25, 400, 290, "C++"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(10, 30, 400, 290, "C++"); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->when(FL_WHEN_NEVER); o->hide(); - { Fl_Group* o = new Fl_Group(90, 35, 300, 20, "Class:"); + { Fl_Group* o = new Fl_Group(95, 40, 310, 20, "Class:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 35, 160, 20); + { Fl_Input* o = new Fl_Input(95, 40, 172, 20); o->tooltip("The widget subclass."); o->labelfont(1); o->labelsize(11); @@ -587,68 +588,68 @@ ive to the origin at construction time"); o->textsize(11); o->callback((Fl_Callback*)subclass_cb, (void*)(4)); Fl_Group::current()->resizable(o); - } - { Fl_Choice* o = new Fl_Choice(250, 35, 140, 20); + } // Fl_Input* o + { Fl_Choice* o = new Fl_Choice(265, 40, 140, 20); o->tooltip("The widget subtype."); o->box(FL_THIN_UP_BOX); o->down_box(FL_BORDER_BOX); o->labelsize(11); o->callback((Fl_Callback*)subtype_cb); - } + } // Fl_Choice* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 60, 300, 20, "Name:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 65, 310, 20, "Name:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 60, 240, 20); + { Fl_Input* o = new Fl_Input(95, 65, 250, 20); o->tooltip("The name of the widget."); o->labelfont(1); o->labelsize(11); o->textsize(11); o->callback((Fl_Callback*)name_cb); Fl_Group::current()->resizable(o); - } - { Fl_Light_Button* o = new Fl_Light_Button(330, 60, 60, 20, "public"); + } // Fl_Input* o + { Fl_Light_Button* o = new Fl_Light_Button(345, 65, 60, 20, "public"); o->tooltip("Make the widget publicly accessible."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)name_public_cb); o->when(FL_WHEN_CHANGED); - } + } // Fl_Light_Button* o o->end(); - } - { Fl_Input* o = v_input[0] = new Fl_Input(90, 85, 300, 20, "Extra Code:"); - o->tooltip("Extra initialization code for the widget."); - o->labelfont(1); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)v_input_cb, (void*)(0)); - } - { Fl_Input* o = v_input[1] = new Fl_Input(90, 105, 300, 20); - o->tooltip("Extra initialization code for the widget."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)v_input_cb, (void*)(1)); - } - { Fl_Input* o = v_input[2] = new Fl_Input(90, 125, 300, 20); - o->tooltip("Extra initialization code for the widget."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)v_input_cb, (void*)(2)); - } - { Fl_Input* o = v_input[3] = new Fl_Input(90, 145, 300, 20); - o->tooltip("Extra initialization code for the widget."); - o->labelsize(11); - o->textfont(4); - o->textsize(11); - o->callback((Fl_Callback*)v_input_cb, (void*)(3)); - } - { CodeEditor* o = new CodeEditor(90, 170, 300, 90, "Callback:"); + } // Fl_Group* o + { v_input[0] = new Fl_Input(95, 90, 310, 20, "Extra Code:"); + v_input[0]->tooltip("Extra initialization code for the widget."); + v_input[0]->labelfont(1); + v_input[0]->labelsize(11); + v_input[0]->textfont(4); + v_input[0]->textsize(11); + v_input[0]->callback((Fl_Callback*)v_input_cb, (void*)(0)); + } // Fl_Input* v_input[0] + { v_input[1] = new Fl_Input(95, 110, 310, 20); + v_input[1]->tooltip("Extra initialization code for the widget."); + v_input[1]->labelsize(11); + v_input[1]->textfont(4); + v_input[1]->textsize(11); + v_input[1]->callback((Fl_Callback*)v_input_cb, (void*)(1)); + } // Fl_Input* v_input[1] + { v_input[2] = new Fl_Input(95, 130, 310, 20); + v_input[2]->tooltip("Extra initialization code for the widget."); + v_input[2]->labelsize(11); + v_input[2]->textfont(4); + v_input[2]->textsize(11); + v_input[2]->callback((Fl_Callback*)v_input_cb, (void*)(2)); + } // Fl_Input* v_input[2] + { v_input[3] = new Fl_Input(95, 150, 310, 20); + v_input[3]->tooltip("Extra initialization code for the widget."); + v_input[3]->labelsize(11); + v_input[3]->textfont(4); + v_input[3]->textsize(11); + v_input[3]->callback((Fl_Callback*)v_input_cb, (void*)(3)); + } // Fl_Input* v_input[3] + { CodeEditor* o = new CodeEditor(95, 175, 310, 90, "Callback:"); o->tooltip("The callback function or code for the widget. Use the variable name \'o\' to \ access the Widget pointer and \'v\' to access the user value."); o->box(FL_DOWN_BOX); @@ -664,13 +665,13 @@ access the Widget pointer and \'v\' to access the user value."); o->align(FL_ALIGN_LEFT); o->when(FL_WHEN_RELEASE); Fl_Group::current()->resizable(o); - } - { Fl_Group* o = new Fl_Group(90, 265, 300, 20, "User Data:"); + } // CodeEditor* o + { Fl_Group* o = new Fl_Group(95, 270, 310, 20, "User Data:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 265, 140, 20); + { Fl_Input* o = new Fl_Input(95, 270, 158, 20); o->tooltip("The user data to pass into the callback code."); o->labelfont(1); o->labelsize(11); @@ -678,8 +679,8 @@ access the Widget pointer and \'v\' to access the user value."); o->textsize(11); o->callback((Fl_Callback*)user_data_cb); Fl_Group::current()->resizable(o); - } - { Fl_Choice* o = new Fl_Choice(285, 265, 105, 20, "When:"); + } // Fl_Input* o + { Fl_Choice* o = new Fl_Choice(300, 270, 105, 20, "When:"); o->tooltip("When to call the callback function."); o->box(FL_THIN_UP_BOX); o->down_box(FL_BORDER_BOX); @@ -688,15 +689,15 @@ access the Widget pointer and \'v\' to access the user value."); o->callback((Fl_Callback*)when_cb); o->when(FL_WHEN_CHANGED); o->menu(whenmenu); - } + } // Fl_Choice* o o->end(); - } - { Fl_Group* o = new Fl_Group(90, 290, 300, 20, "Type:"); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(95, 295, 310, 20, "Type:"); o->labelfont(1); o->labelsize(11); o->callback((Fl_Callback*)propagate_load); o->align(FL_ALIGN_LEFT); - { Fl_Input* o = new Fl_Input(90, 290, 140, 20); + { Fl_Input* o = new Fl_Input(95, 295, 158, 20); o->tooltip("The type of the user data."); o->labelfont(1); o->labelsize(11); @@ -704,61 +705,61 @@ access the Widget pointer and \'v\' to access the user value."); o->textsize(11); o->callback((Fl_Callback*)user_data_type_cb); Fl_Group::current()->resizable(o); - } - { Fl_Light_Button* o = new Fl_Light_Button(285, 290, 105, 20, "No Change"); + } // Fl_Input* o + { Fl_Light_Button* o = new Fl_Light_Button(300, 295, 105, 20, "No Change"); o->tooltip("Call the callback even if the value has not changed."); o->selection_color((Fl_Color)1); o->labelsize(11); o->callback((Fl_Callback*)when_button_cb); - } + } // Fl_Light_Button* o o->end(); - } + } // Fl_Group* o o->end(); - } + } // Fl_Group* o o->end(); Fl_Group::current()->resizable(o); - } - { Fl_Group* o = new Fl_Group(8, 321, 391, 24); + } // Fl_Tabs* o + { Fl_Group* o = new Fl_Group(9, 330, 400, 20); o->labelsize(11); - { Fl_Box* o = new Fl_Box(8, 325, 20, 20); + { Fl_Box* o = new Fl_Box(9, 330, 20, 20); o->labelsize(11); Fl_Group::current()->resizable(o); - } - { Fl_Button* o = new Fl_Button(231, 325, 99, 20, "Hide &Overlays"); + } // Fl_Box* o + { Fl_Button* o = new Fl_Button(240, 330, 99, 20, "Hide &Overlays"); o->tooltip("Hide the widget overlay box."); o->labelsize(11); o->labelcolor((Fl_Color)1); o->callback((Fl_Callback*)overlay_cb); - } - { Fl_Button* o = new Fl_Button(80, 325, 80, 20, "Revert"); + } // Fl_Button* o + { Fl_Button* o = new Fl_Button(66, 330, 80, 20, "Revert"); o->labelsize(11); o->callback((Fl_Callback*)revert_cb); o->hide(); - } - { Fl_Return_Button* o = new Fl_Return_Button(335, 325, 64, 20, "Close"); + } // Fl_Button* o + { Fl_Return_Button* o = new Fl_Return_Button(344, 330, 64, 20, "Close"); o->labelsize(11); o->callback((Fl_Callback*)ok_cb); - } - { Fl_Button* o = new Fl_Button(329, 325, 70, 20, "Cancel"); + } // Fl_Return_Button* o + { Fl_Button* o = new Fl_Button(339, 330, 70, 20, "Cancel"); o->labelsize(11); o->callback((Fl_Callback*)cancel_cb); o->hide(); - } - { Fl_Button* o = wLiveMode = new Fl_Button(142, 325, 84, 20, "Live &Mode"); - o->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\ + } // Fl_Button* o + { wLiveMode = new Fl_Button(151, 330, 84, 20, "Live &Mode"); + wLiveMode->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\ avior."); - o->type(1); - o->labelsize(11); - o->callback((Fl_Callback*)live_mode_cb); - } + wLiveMode->type(1); + wLiveMode->labelsize(11); + wLiveMode->callback((Fl_Callback*)live_mode_cb); + } // Fl_Button* wLiveMode o->end(); - } + } // Fl_Group* o o->size_range(o->w(), o->h()); o->end(); - } + } // Fl_Double_Window* o return w; } // -// End of "$Id: widget_panel.cxx 4625 2005-11-02 13:55:13Z matt $". +// End of "$Id: widget_panel.cxx 5438 2006-09-17 14:58:25Z mike $". // diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index df6da02..861d2d9 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -1,9 +1,9 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0107 +version 1.0108 header_name {.h} code_name {.cxx} comment {// -// "$Id: widget_panel.fl 4625 2005-11-02 13:55:13Z matt $" +// "$Id: widget_panel.fl 5438 2006-09-17 14:58:25Z mike $" // // Widget panel for the Fast Light Tool Kit (FLTK). // @@ -33,31 +33,31 @@ comment {// Function {make_widget_panel()} {open } { - Fl_Window {} {open - xywh {353 184 410 355} type Double labelsize 11 resizable hotspot + Fl_Window {} {open selected + xywh {711 172 420 360} type Double labelsize 11 align 80 resizable hotspot code0 {o->size_range(o->w(), o->h());} visible } { Fl_Tabs {} { callback {propagate_load((Fl_Group *)o,v);} open - xywh {5 5 400 310} selection_color 4 labelsize 11 labelcolor 7 when 0 resizable + xywh {10 10 400 310} selection_color 12 labelsize 11 labelcolor 7 when 0 resizable } { Fl_Group {} { label GUI callback propagate_load - xywh {5 25 400 290} labelsize 11 when 0 resizable + xywh {10 30 400 290} labelsize 11 when 0 resizable } { Fl_Group {} { label {Label:} callback propagate_load - xywh {90 35 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 40 309 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { callback label_cb - tooltip {The label text for the widget.} xywh {90 35 180 20} labelfont 1 labelsize 11 when 1 textsize 11 resizable + tooltip {The label text for the widget.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 textsize 11 resizable } Fl_Choice {} { callback labeltype_cb open - tooltip {The label style for the widget.} xywh {270 35 120 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 + tooltip {The label style for the widget.} xywh {284 40 120 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 code0 {extern Fl_Menu_Item labeltypemenu[];} code1 {o->menu(labeltypemenu);} } {} @@ -65,427 +65,427 @@ Function {make_widget_panel()} {open Fl_Group {} { label {Image:} callback propagate_load - xywh {90 60 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 65 309 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { callback image_cb - tooltip {The active image for the widget.} xywh {90 60 230 20} labelfont 1 labelsize 11 textsize 11 resizable + tooltip {The active image for the widget.} xywh {95 65 240 20} labelfont 1 labelsize 11 textsize 11 resizable } Fl_Button {} { label {Browse...} callback image_browse_cb - tooltip {Click to choose the active image.} xywh {320 60 70 20} labelsize 11 + tooltip {Click to choose the active image.} xywh {334 65 70 20} labelsize 11 } } Fl_Group {} { label {Inactive:} callback propagate_load - xywh {90 85 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 90 309 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { callback inactive_cb - tooltip {The inactive image for the widget.} xywh {90 85 230 20} labelfont 1 labelsize 11 textsize 11 resizable + tooltip {The inactive image for the widget.} xywh {95 90 240 20} labelfont 1 labelsize 11 textsize 11 resizable } Fl_Button {} { label {Browse...} callback inactive_browse_cb - tooltip {Click to choose the inactive image.} xywh {320 85 70 20} labelsize 11 + tooltip {Click to choose the inactive image.} xywh {334 90 70 20} labelsize 11 } } Fl_Group {} { label {Alignment:} callback propagate_load - xywh {90 110 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 115 300 20} labelfont 1 labelsize 11 align 4 } { Fl_Button {} { label Clip user_data FL_ALIGN_CLIP callback align_cb - tooltip {Clip the label to the inside of the widget.} xywh {90 110 45 20} type Toggle selection_color 8 labelsize 11 align 16 + tooltip {Clip the label to the inside of the widget.} xywh {95 115 45 20} type Toggle selection_color 8 labelsize 11 align 16 } Fl_Button {} { label Wrap user_data FL_ALIGN_WRAP - callback align_cb selected - tooltip {Wrap the label text.} xywh {140 110 50 20} type Toggle selection_color 8 labelsize 11 + callback align_cb + tooltip {Wrap the label text.} xywh {145 115 50 20} type Toggle selection_color 8 labelsize 11 } Fl_Button {} { label {Text/Image} user_data FL_ALIGN_TEXT_OVER_IMAGE callback align_cb - tooltip {Show the label text over the image.} xywh {195 110 65 20} type Toggle selection_color 8 labelsize 11 + tooltip {Show the label text over the image.} xywh {200 115 65 20} type Toggle selection_color 8 labelsize 11 } Fl_Button {} { label {@-1<-} user_data FL_ALIGN_LEFT callback align_cb - tooltip {Left-align the label.} xywh {265 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 + tooltip {Left-align the label.} xywh {270 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 } Fl_Button {} { label {@-1->} user_data FL_ALIGN_RIGHT callback align_cb - tooltip {Right-align the label.} xywh {290 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 + tooltip {Right-align the label.} xywh {295 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 } Fl_Button {} { label {@-18} user_data FL_ALIGN_TOP callback align_cb - tooltip {Top-align the label.} xywh {315 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 + tooltip {Top-align the label.} xywh {320 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 } Fl_Button {} { label {@-12} user_data FL_ALIGN_BOTTOM callback align_cb - tooltip {Bottom-align the label.} xywh {340 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 + tooltip {Bottom-align the label.} xywh {345 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 } Fl_Button {} { label {@-3square} user_data FL_ALIGN_INSIDE callback align_cb - tooltip {Show the label inside the widget.} xywh {365 110 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 + tooltip {Show the label inside the widget.} xywh {370 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 } Fl_Box {} { - xywh {390 110 0 20} labelsize 11 resizable + xywh {395 115 0 20} labelsize 11 resizable } } Fl_Group {} { label {Position:} callback propagate_load open - xywh {90 145 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 150 300 20} labelfont 1 labelsize 11 align 4 } { Fl_Value_Input widget_x_input { label {X:} callback x_cb - tooltip {The X position of the widget.} xywh {90 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The X position of the widget.} xywh {95 150 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Value_Input widget_y_input { label {Y:} callback y_cb - tooltip {The Y position of the widget.} xywh {150 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The Y position of the widget.} xywh {155 150 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Value_Input widget_w_input { label {Width:} callback w_cb - tooltip {The width of the widget.} xywh {210 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The width of the widget.} xywh {215 150 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Value_Input widget_h_input { label {Height:} callback h_cb - tooltip {The height of the widget.} xywh {270 145 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The height of the widget.} xywh {275 150 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Light_Button {} { label Relative callback wc_relative_cb - tooltip {If set, widgets inside a widget class of type Fl_Group are repositioned relative to the origin at construction time} xywh {330 145 55 20} labelsize 11 + tooltip {If set, widgets inside a widget class of type Fl_Group are repositioned relative to the origin at construction time} xywh {335 150 55 20} labelsize 11 } Fl_Box {} { - xywh {389 145 1 20} resizable + xywh {394 150 1 20} resizable } } Fl_Group {} { label {Values:} callback propagate_load - xywh {90 180 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 185 300 20} labelfont 1 labelsize 11 align 4 } { Fl_Value_Input {} { label {Size:} callback slider_size_cb - tooltip {The size of the slider.} xywh {90 180 55 20} labelsize 11 align 5 step 0.010101 textsize 11 + tooltip {The size of the slider.} xywh {95 185 55 20} labelsize 11 align 5 step 0.010101 textsize 11 } Fl_Value_Input {} { label {Minimum:} callback min_cb - tooltip {The minimum value of the widget.} xywh {150 180 55 20} labelsize 11 align 5 textsize 11 + tooltip {The minimum value of the widget.} xywh {155 185 55 20} labelsize 11 align 5 textsize 11 } Fl_Value_Input {} { label {Maximum:} callback max_cb - tooltip {The maximum value of the widget.} xywh {210 180 55 20} labelsize 11 align 5 value 1 textsize 11 + tooltip {The maximum value of the widget.} xywh {215 185 55 20} labelsize 11 align 5 value 1 textsize 11 } Fl_Value_Input {} { label {Step:} callback step_cb - tooltip {The resolution of the widget value.} xywh {270 180 55 20} labelsize 11 align 5 textsize 11 + tooltip {The resolution of the widget value.} xywh {275 185 55 20} labelsize 11 align 5 textsize 11 } Fl_Value_Input {} { label {Value:} callback value_cb - tooltip {The current widget value.} xywh {330 180 55 20} labelsize 11 align 5 textsize 11 + tooltip {The current widget value.} xywh {335 185 55 20} labelsize 11 align 5 textsize 11 } Fl_Box {} { - xywh {390 180 0 20} resizable + xywh {395 185 0 20} resizable } } Fl_Group {} { label {Size Range:} callback propagate_load - xywh {90 180 300 20} labelfont 1 labelsize 11 align 4 hide + xywh {95 185 300 20} labelfont 1 labelsize 11 align 4 hide } { Fl_Value_Input {} { label {Minimum Size:} callback min_w_cb - tooltip {The size of the slider.} xywh {90 180 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The size of the slider.} xywh {95 185 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Value_Input {} { callback min_h_cb - tooltip {The minimum value of the widget.} xywh {150 180 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The minimum value of the widget.} xywh {155 185 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Button {} { label set callback set_min_size_cb - xywh {210 180 25 20} labelsize 11 + xywh {215 185 25 20} labelsize 11 } Fl_Value_Input {} { label {Maximum Size:} callback max_w_cb - tooltip {The maximum value of the widget.} xywh {240 180 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The maximum value of the widget.} xywh {245 185 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Value_Input {} { callback max_h_cb - tooltip {The resolution of the widget value.} xywh {300 180 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 + tooltip {The resolution of the widget value.} xywh {305 185 55 20} labelsize 11 align 5 maximum 2048 step 1 textsize 11 } Fl_Button {} { label set callback set_max_size_cb - xywh {360 180 25 20} labelsize 11 + xywh {365 185 25 20} labelsize 11 } Fl_Box {} { - xywh {390 180 0 20} resizable + xywh {395 185 0 20} resizable } } Fl_Button {} { label {Shortcut:} callback shortcut_in_cb - tooltip {The shortcut key for the widget.} xywh {90 205 300 20} box DOWN_BOX color 7 selection_color 7 labelfont 1 labelsize 11 align 4 + tooltip {The shortcut key for the widget.} xywh {95 210 310 20} box DOWN_BOX color 7 selection_color 7 labelfont 1 labelsize 11 align 4 code0 {\#include "Shortcut_Button.h"} class Shortcut_Button } Fl_Group {} { label {X Class:} callback propagate_load - xywh {90 230 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 235 300 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { label {:} callback xclass_cb - tooltip {The X resource class.} xywh {90 230 95 20} labelfont 1 labelsize 11 textsize 11 resizable + tooltip {The X resource class.} xywh {95 235 95 20} labelfont 1 labelsize 11 textsize 11 resizable } Fl_Light_Button {} { label Border callback border_cb - tooltip {Add a border around the window.} xywh {190 230 60 20} selection_color 1 labelsize 11 + tooltip {Add a border around the window.} xywh {195 235 60 20} selection_color 1 labelsize 11 } Fl_Light_Button {} { label Modal callback modal_cb - tooltip {Make the window modal.} xywh {255 230 55 20} selection_color 1 labelsize 11 + tooltip {Make the window modal.} xywh {260 235 55 20} selection_color 1 labelsize 11 } Fl_Light_Button {} { label Nonmodal callback non_modal_cb - tooltip {Make the window non-modal.} xywh {315 230 75 20} selection_color 1 labelsize 11 align 148 + tooltip {Make the window non-modal.} xywh {320 235 75 20} selection_color 1 labelsize 11 align 148 } } Fl_Group {} { label {Attributes:} callback propagate_load - xywh {90 255 305 20} labelfont 1 labelsize 11 align 4 + xywh {95 260 305 20} labelfont 1 labelsize 11 align 4 } { Fl_Light_Button {} { label Visible callback visible_cb - tooltip {Show the widget.} xywh {90 255 60 20} selection_color 1 labelsize 11 + tooltip {Show the widget.} xywh {95 260 60 20} selection_color 1 labelsize 11 } Fl_Light_Button {} { label Active callback active_cb - tooltip {Activate the widget.} xywh {155 255 60 20} selection_color 1 labelsize 11 + tooltip {Activate the widget.} xywh {160 260 60 20} selection_color 1 labelsize 11 } Fl_Light_Button {} { label Resizable callback resizable_cb - tooltip {Make the widget resizable.} xywh {220 255 75 20} selection_color 1 labelsize 11 when 1 + tooltip {Make the widget resizable.} xywh {225 260 75 20} selection_color 1 labelsize 11 when 1 } Fl_Light_Button {} { label Hotspot callback hotspot_cb - tooltip {Center the window under this widget.} xywh {300 255 70 20} selection_color 1 labelsize 11 when 1 + tooltip {Center the window under this widget.} xywh {305 260 70 20} selection_color 1 labelsize 11 when 1 } Fl_Box {} { - xywh {390 255 0 20} labelsize 11 resizable + xywh {395 260 0 20} labelsize 11 resizable } } Fl_Input {} { label {Tooltip:} callback tooltip_cb - tooltip {The tooltip text for the widget.} xywh {90 280 300 20} labelfont 1 labelsize 11 textsize 11 + tooltip {The tooltip text for the widget.} xywh {95 285 310 20} labelfont 1 labelsize 11 textsize 11 } Fl_Box {} { - xywh {90 300 300 5} labelsize 11 resizable + xywh {95 305 300 5} labelsize 11 resizable } } Fl_Group {} { label Style callback propagate_load - xywh {5 25 400 290} labelsize 11 when 0 hide + xywh {10 30 400 290} labelsize 11 when 0 hide } { Fl_Group {} { label {Label Font:} callback propagate_load open - xywh {90 35 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 40 309 20} labelfont 1 labelsize 11 align 4 } { Fl_Choice {} { callback labelfont_cb open - tooltip {The style of the label text.} xywh {90 35 160 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable + tooltip {The style of the label text.} xywh {95 40 170 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable code0 {extern Fl_Menu_Item fontmenu[];} code1 {o->menu(fontmenu);} } {} Fl_Value_Input {} { callback labelsize_cb - tooltip {The size of the label text.} xywh {250 35 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11 + tooltip {The size of the label text.} xywh {264 40 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11 } Fl_Button {} { label {Label Color} callback labelcolor_cb - tooltip {The color of the label text.} xywh {300 35 90 20} labelsize 11 + tooltip {The color of the label text.} xywh {314 40 90 20} labelsize 11 } } Fl_Group {} { label {Box:} callback propagate_load open - xywh {90 60 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 65 309 20} labelfont 1 labelsize 11 align 4 } { Fl_Choice {} { callback box_cb open - tooltip {The "up" box of the widget.} xywh {90 60 210 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable + tooltip {The "up" box of the widget.} xywh {95 65 219 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable code0 {extern Fl_Menu_Item boxmenu[];} code1 {o->menu(boxmenu);} } {} Fl_Button {} { label Color callback color_cb - tooltip {The background color of the widget.} xywh {300 60 90 20} labelsize 11 + tooltip {The background color of the widget.} xywh {314 65 90 20} labelsize 11 } } Fl_Group {} { label {Down Box:} callback propagate_load open - xywh {90 85 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 90 309 20} labelfont 1 labelsize 11 align 4 } { Fl_Choice {} { callback down_box_cb open - tooltip {The "down" box of the widget.} xywh {90 85 210 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable + tooltip {The "down" box of the widget.} xywh {95 90 219 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable code0 {extern Fl_Menu_Item boxmenu[];} code1 {o->menu(boxmenu);} } {} Fl_Button {} { label {Select Color} callback color2_cb - tooltip {The selection color of the widget.} xywh {300 85 90 20} labelsize 11 + tooltip {The selection color of the widget.} xywh {314 90 90 20} labelsize 11 } } Fl_Group {} { label {Text Font:} callback propagate_load open - xywh {90 110 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 115 309 20} labelfont 1 labelsize 11 align 4 } { Fl_Choice {} { callback textfont_cb open - tooltip {The value text style.} xywh {90 110 160 20} box DOWN_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable + tooltip {The value text style.} xywh {95 115 170 20} box DOWN_BOX down_box BORDER_BOX labelfont 1 labelsize 11 resizable code0 {extern Fl_Menu_Item fontmenu[];} code1 {o->menu(fontmenu);} } {} Fl_Value_Input {} { callback textsize_cb - tooltip {The value text size.} xywh {250 110 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11 + tooltip {The value text size.} xywh {264 115 50 20} labelsize 11 maximum 100 step 1 value 14 textsize 11 } Fl_Button {} { label {Text Color} callback textcolor_cb - tooltip {The value text color.} xywh {300 110 90 20} labelsize 11 + tooltip {The value text color.} xywh {314 115 90 20} labelsize 11 } } Fl_Box {} { - xywh {90 135 300 40} labelsize 11 resizable + xywh {95 140 300 40} labelsize 11 resizable } } Fl_Group {} { label {C++} callback propagate_load - xywh {5 25 400 290} labelsize 11 when 0 hide + xywh {10 30 400 290} labelsize 11 when 0 hide } { Fl_Group {} { label {Class:} callback propagate_load - xywh {90 35 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 40 310 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { user_data 4 callback subclass_cb - tooltip {The widget subclass.} xywh {90 35 160 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable + tooltip {The widget subclass.} xywh {95 40 172 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable } Fl_Choice {} { callback subtype_cb open - tooltip {The widget subtype.} xywh {250 35 140 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 + tooltip {The widget subtype.} xywh {265 40 140 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 } {} } Fl_Group {} { label {Name:} callback propagate_load - xywh {90 60 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 65 310 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { callback name_cb - tooltip {The name of the widget.} xywh {90 60 240 20} labelfont 1 labelsize 11 textsize 11 resizable + tooltip {The name of the widget.} xywh {95 65 250 20} labelfont 1 labelsize 11 textsize 11 resizable } Fl_Light_Button {} { label public callback name_public_cb - tooltip {Make the widget publicly accessible.} xywh {330 60 60 20} selection_color 1 labelsize 11 when 1 + tooltip {Make the widget publicly accessible.} xywh {345 65 60 20} selection_color 1 labelsize 11 when 1 } } Fl_Input {v_input[0]} { label {Extra Code:} user_data 0 callback v_input_cb - tooltip {Extra initialization code for the widget.} xywh {90 85 300 20} labelfont 1 labelsize 11 textfont 4 textsize 11 + tooltip {Extra initialization code for the widget.} xywh {95 90 310 20} labelfont 1 labelsize 11 textfont 4 textsize 11 } Fl_Input {v_input[1]} { user_data 1 callback v_input_cb - tooltip {Extra initialization code for the widget.} xywh {90 105 300 20} labelsize 11 textfont 4 textsize 11 + tooltip {Extra initialization code for the widget.} xywh {95 110 310 20} labelsize 11 textfont 4 textsize 11 } Fl_Input {v_input[2]} { user_data 2 callback v_input_cb - tooltip {Extra initialization code for the widget.} xywh {90 125 300 20} labelsize 11 textfont 4 textsize 11 + tooltip {Extra initialization code for the widget.} xywh {95 130 310 20} labelsize 11 textfont 4 textsize 11 } Fl_Input {v_input[3]} { user_data 3 callback v_input_cb - tooltip {Extra initialization code for the widget.} xywh {90 145 300 20} labelsize 11 textfont 4 textsize 11 + tooltip {Extra initialization code for the widget.} xywh {95 150 310 20} labelsize 11 textfont 4 textsize 11 } Fl_Text_Editor {} { label {Callback:} callback callback_cb - tooltip {The callback function or code for the widget. Use the variable name 'o' to access the Widget pointer and 'v' to access the user value.} xywh {90 170 300 90} box DOWN_BOX labelfont 1 labelsize 11 align 4 textfont 4 textsize 11 resizable + tooltip {The callback function or code for the widget. Use the variable name 'o' to access the Widget pointer and 'v' to access the user value.} xywh {95 175 310 90} box DOWN_BOX labelfont 1 labelsize 11 align 4 textfont 4 textsize 11 resizable code0 {\#include "CodeEditor.h"} class CodeEditor } Fl_Group {} { label {User Data:} callback propagate_load - xywh {90 265 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 270 310 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { callback user_data_cb - tooltip {The user data to pass into the callback code.} xywh {90 265 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable + tooltip {The user data to pass into the callback code.} xywh {95 270 158 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable } Fl_Choice {} { label {When:} callback when_cb open - tooltip {When to call the callback function.} xywh {285 265 105 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 when 1 + tooltip {When to call the callback function.} xywh {300 270 105 20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 when 1 code0 {extern Fl_Menu_Item whenmenu[];} code1 {o->menu(whenmenu);} } {} @@ -493,50 +493,50 @@ Function {make_widget_panel()} {open Fl_Group {} { label {Type:} callback propagate_load - xywh {90 290 300 20} labelfont 1 labelsize 11 align 4 + xywh {95 295 310 20} labelfont 1 labelsize 11 align 4 } { Fl_Input {} { callback user_data_type_cb - tooltip {The type of the user data.} xywh {90 290 140 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable + tooltip {The type of the user data.} xywh {95 295 158 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable } Fl_Light_Button {} { label {No Change} callback when_button_cb - tooltip {Call the callback even if the value has not changed.} xywh {285 290 105 20} selection_color 1 labelsize 11 + tooltip {Call the callback even if the value has not changed.} xywh {300 295 105 20} selection_color 1 labelsize 11 } } } } - Fl_Group {} { - xywh {8 321 391 24} labelsize 11 + Fl_Group {} {open + xywh {9 330 400 20} labelsize 11 } { Fl_Box {} { - xywh {8 325 20 20} labelsize 11 resizable + xywh {9 330 20 20} labelsize 11 resizable } Fl_Button {} { label {Hide &Overlays} callback overlay_cb - tooltip {Hide the widget overlay box.} xywh {231 325 99 20} labelsize 11 labelcolor 1 + tooltip {Hide the widget overlay box.} xywh {240 330 99 20} labelsize 11 labelcolor 1 } Fl_Button {} { label Revert callback revert_cb - xywh {80 325 80 20} labelsize 11 hide + xywh {66 330 80 20} labelsize 11 hide } Fl_Return_Button {} { label Close callback ok_cb - xywh {335 325 64 20} labelsize 11 + xywh {344 330 64 20} labelsize 11 } Fl_Button {} { label Cancel callback cancel_cb - xywh {329 325 70 20} labelsize 11 hide + xywh {339 330 70 20} labelsize 11 hide } Fl_Button wLiveMode { label {Live &Mode} callback live_mode_cb - tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {142 325 84 20} type Toggle labelsize 11 + tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {151 330 84 20} type Toggle labelsize 11 } } } @@ -544,6 +544,6 @@ Function {make_widget_panel()} {open comment { // -// End of "$Id: widget_panel.fl 4625 2005-11-02 13:55:13Z matt $". +// End of "$Id: widget_panel.fl 5438 2006-09-17 14:58:25Z mike $". //} {in_source in_header } diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h index 61d6b64..ecdb8e8 100644 --- a/fluid/widget_panel.h +++ b/fluid/widget_panel.h @@ -1,5 +1,5 @@ // -// "$Id: widget_panel.h 4554 2005-08-30 21:57:23Z matt $" +// "$Id: widget_panel.h 5438 2006-09-17 14:58:25Z mike $" // // Widget panel for the Fast Light Tool Kit (FLTK). // @@ -25,7 +25,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0108 #ifndef widget_panel_h #define widget_panel_h @@ -115,5 +115,5 @@ Fl_Double_Window* make_widget_panel(); #endif // -// End of "$Id: widget_panel.h 4554 2005-08-30 21:57:23Z matt $". +// End of "$Id: widget_panel.h 5438 2006-09-17 14:58:25Z mike $". // |