Author: matt
Date: 2011-05-22 15:43:15 -0700 (Sun, 22 May 2011)
New Revision: 8719
Log:
123: Fluid somewhat working.
Modified:
branches/branch-3.0/fluid/Fl_Function_Type.cxx
branches/branch-3.0/fluid/Fl_Group_Type.cxx
branches/branch-3.0/fluid/Fl_Menu_Type.cxx
branches/branch-3.0/fluid/Fl_Type.cxx
branches/branch-3.0/fluid/Fl_Type.h
branches/branch-3.0/fluid/Fl_Widget_Type.cxx
branches/branch-3.0/fluid/Fluid_Image.cxx
branches/branch-3.0/fluid/factory.cxx
branches/branch-3.0/fluid/function_panel.cxx
Modified: branches/branch-3.0/fluid/Fl_Function_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Function_Type.cxx 2011-05-22 21:38:26 UTC
(rev 8718)
+++ branches/branch-3.0/fluid/Fl_Function_Type.cxx 2011-05-22 22:43:15 UTC
(rev 8719)
@@ -678,7 +678,7 @@
// 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,"fltk3::EXPORT",9) && isspace(c[9]))
+ || (!strncmp(c,"FLTK3_EXPORT",9) && isspace(c[9]))
|| (!strncmp(c,"struct",6) && isspace(c[6]))
) ) {
write_public(public_);
@@ -692,7 +692,7 @@
|| (!strncmp(c,"class",5) && isspace(c[5]))
|| (!strncmp(c,"typedef",7) && isspace(c[7]))
|| (!strncmp(c,"using",5) && isspace(c[5]))
- || (!strncmp(c,"fltk3::EXPORT",9) && isspace(c[9]))
+ || (!strncmp(c,"FLTK3_EXPORT",9) && isspace(c[9]))
// || !strncmp(c,"struct",6) && isspace(c[6])
) {
if (public_) {
Modified: branches/branch-3.0/fluid/Fl_Group_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Group_Type.cxx 2011-05-22 21:38:26 UTC (rev
8718)
+++ branches/branch-3.0/fluid/Fl_Group_Type.cxx 2011-05-22 22:43:15 UTC (rev
8719)
@@ -129,7 +129,7 @@
write_extra_code();
write_c("%s%s->end();\n", indent(), var);
if (resizable()) {
- write_c("%sFl_Group::current()->resizable(%s);\n", indent(), var);
+ write_c("%sfltk3::Group::current()->resizable(%s);\n", indent(), var);
}
write_block_close();
}
@@ -438,7 +438,7 @@
////////////////////////////////////////////////////////////////
-const char tile_type_name[] = "Fl_Tile";
+const char tile_type_name[] = "fltk3::Tile";
Fl_Tile_Type Fl_Tile_type; // the "factory"
Modified: branches/branch-3.0/fluid/Fl_Menu_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-22 21:38:26 UTC (rev
8718)
+++ branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-22 22:43:15 UTC (rev
8719)
@@ -234,11 +234,11 @@
if (k) {
int i;
if (i18n_type) write_c("\nunsigned char %s::%s_i18n_done = 0;", k,
menu_name(i));
- write_c("\nFl_Menu_Item %s::%s[] = {\n", k, menu_name(i));
+ write_c("\nfltk3::MenuItem %s::%s[] = {\n", k, menu_name(i));
} else {
int i;
if (i18n_type) write_c("\nunsigned char %s_i18n_done = 0;", menu_name(i));
- write_c("\nFl_Menu_Item %s[] = {\n", menu_name(i));
+ write_c("\nfltk3::MenuItem %s[] = {\n", menu_name(i));
}
Fl_Type* 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) {
@@ -287,14 +287,14 @@
void Fl_Menu_Item_Type::write_item() {
static const char * const labeltypes[] = {
- "FL_NORMAL_LABEL",
- "FL_NO_LABEL",
- "FL_SHADOW_LABEL",
- "FL_ENGRAVED_LABEL",
- "FL_EMBOSSED_LABEL",
- "FL_MULTI_LABEL",
- "FL_ICON_LABEL",
- "FL_IMAGE_LABEL"
+ "fltk3::NORMAL_LABEL",
+ "fltk3::NO_LABEL",
+ "fltk3::SHADOW_LABEL",
+ "fltk3::ENGRAVED_LABEL",
+ "fltk3::EMBOSSED_LABEL",
+ "fltk3::MULTI_LABEL",
+ "fltk3::ICON_LABEL",
+ "fltk3::IMAGE_LABEL"
};
write_c(" {");
@@ -304,7 +304,7 @@
if (((fltk3::Button*)o)->shortcut()) {
int s = ((fltk3::Button*)o)->shortcut();
if (use_FL_COMMAND && (s & (fltk3::CTRL|fltk3::META))) {
- write_c(", FL_COMMAND|0x%x, ", s &
~(fltk3::CTRL|fltk3::META));
+ write_c(", fltk3::COMMAND|0x%x, ", s &
~(fltk3::CTRL|fltk3::META));
} else {
write_c(", 0x%x, ", s);
}
Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx 2011-05-22 21:38:26 UTC (rev
8718)
+++ branches/branch-3.0/fluid/Fl_Type.cxx 2011-05-22 22:43:15 UTC (rev
8719)
@@ -312,7 +312,7 @@
Y += comment_incr;
if (l->is_widget() || l->is_class()) {
const char* c = subclassname(l);
- if (!strncmp(c,"Fl_",3)) c += 3;
+ if (!strncmp(c,"fltk3::",7)) c += 7;
fltk3::font(textfont(), textsize());
fltk3::draw(c, X, Y+13);
X += int(fltk3::width(c)+fltk3::width('n'));
@@ -356,7 +356,7 @@
if (l->is_widget() || l->is_class()) {
const char* c = l->type_name();
- if (!strncmp(c,"Fl_",3)) c += 3;
+ if (!strncmp(c,"fltk3::",7)) c += 7;
fltk3::font(textfont(), textsize());
W += int(fltk3::width(c) + fltk3::width('n'));
c = l->name();
Modified: branches/branch-3.0/fluid/Fl_Type.h
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.h 2011-05-22 21:38:26 UTC (rev 8718)
+++ branches/branch-3.0/fluid/Fl_Type.h 2011-05-22 22:43:15 UTC (rev 8719)
@@ -433,7 +433,7 @@
class Fl_Group_Type : public Fl_Widget_Type {
public:
virtual const char *type_name() {return "fltk3::Group";}
- virtual const char *alt_type_name() {return "fltk::Group";}
+ virtual const char *alt_type_name() {return "Fl_Group";}
fltk3::Widget *widget(int X,int Y,int W,int H) {
igroup *g = new igroup(X,Y,W,H); fltk3::Group::current(0); return g;}
Fl_Widget_Type *_make() {return new Fl_Group_Type();}
@@ -459,7 +459,7 @@
fltk3::MenuItem *subtypes() {return pack_type_menu;}
public:
virtual const char *type_name() {return pack_type_name;}
- virtual const char *alt_type_name() {return "fltk::PackedGroup";}
+ virtual const char *alt_type_name() {return "Fl_Pack";}
Fl_Widget_Type *_make() {return new Fl_Pack_Type();}
int pixmapID() { return 22; }
void copy_properties();
@@ -470,7 +470,7 @@
class Fl_Table_Type : public Fl_Group_Type {
public:
virtual const char *type_name() {return table_type_name;}
- virtual const char *alt_type_name() {return "fltk::TableGroup";}
+ virtual const char *alt_type_name() {return "Fl_Table";}
Fl_Widget_Type *_make() {return new Fl_Table_Type();}
fltk3::Widget *widget(int X,int Y,int W,int H);
int pixmapID() { return 51; }
@@ -490,7 +490,7 @@
y = fltk3::height() + o->labelsize() - 6;
}
virtual const char *type_name() {return tabs_type_name;}
- virtual const char *alt_type_name() {return "fltk::TabGroup";}
+ virtual const char *alt_type_name() {return "Fl_Tabs";}
fltk3::Widget *widget(int X,int Y,int W,int H) {
itabs *g = new itabs(X,Y,W,H); fltk3::Group::current(0); return g;}
Fl_Widget_Type *_make() {return new Fl_Tabs_Type();}
@@ -508,7 +508,7 @@
fltk3::MenuItem *subtypes() {return scroll_type_menu;}
public:
virtual const char *type_name() {return scroll_type_name;}
- virtual const char *alt_type_name() {return "fltk::ScrollGroup";}
+ virtual const char *alt_type_name() {return "Fl_Scroll";}
Fl_Widget_Type *_make() {return new Fl_Scroll_Type();}
int pixmapID() { return 19; }
fltk3::Widget *enter_live_mode(int top=0);
@@ -520,7 +520,7 @@
class Fl_Tile_Type : public Fl_Group_Type {
public:
virtual const char *type_name() {return tile_type_name;}
- virtual const char *alt_type_name() {return "fltk::TileGroup";}
+ virtual const char *alt_type_name() {return "Fl_Tile";}
Fl_Widget_Type *_make() {return new Fl_Tile_Type();}
int pixmapID() { return 20; }
void copy_properties();
@@ -531,7 +531,7 @@
class Fl_Wizard_Type : public Fl_Group_Type {
public:
virtual const char *type_name() {return wizard_type_name;}
- virtual const char *alt_type_name() {return "fltk::WizardGroup";}
+ virtual const char *alt_type_name() {return "Fl_Wizard";}
fltk3::Widget *widget(int X,int Y,int W,int H) {
iwizard *g = new iwizard(X,Y,W,H); fltk3::Group::current(0); return g;}
Fl_Widget_Type *_make() {return new Fl_Wizard_Type();}
@@ -574,7 +574,7 @@
Fl_Type *make();
virtual const char *type_name() {return "fltk3::Window";}
- virtual const char *alt_type_name() {return "fltk::Window";}
+ virtual const char *alt_type_name() {return "Fl_Window";}
void open();
@@ -631,7 +631,7 @@
public:
fltk3::MenuItem* subtypes() {return menu_item_type_menu;}
const char* type_name() {return "MenuItem";}
- const char* alt_type_name() {return "fltk::Item";}
+ const char* alt_type_name() {return "Fl_Menu_Item";}
Fl_Type* make();
int is_menu_item() const {return 1;}
int is_button() const {return 1;} // this gets shortcut to work
@@ -650,7 +650,7 @@
public:
fltk3::MenuItem* subtypes() {return 0;}
const char* type_name() {return "Submenu";}
- const char* alt_type_name() {return "fltk::ItemGroup";}
+ const char* alt_type_name() {return "Submenu";}
int is_parent() const {return 1;}
int is_button() const {return 0;} // disable shortcut
Fl_Type* make();
@@ -707,7 +707,7 @@
if (w < (15 + h)) w = 15 + h;
}
virtual const char *type_name() {return "fltk3::MenuButton";}
- virtual const char *alt_type_name() {return "fltk::MenuButton";}
+ virtual const char *alt_type_name() {return "Fl_Menu_Button";}
fltk3::Widget *widget(int X,int Y,int W,int H) {
return new fltk3::MenuButton(X,Y,W,H,"menu");}
Fl_Widget_Type *_make() {return new Fl_Menu_Button_Type();}
@@ -731,7 +731,7 @@
if (w < (15 + h)) w = 15 + h;
}
virtual const char *type_name() {return "fltk3::Choice";}
- virtual const char *alt_type_name() {return "fltk::Choice";}
+ virtual const char *alt_type_name() {return "Fl_Choice";}
fltk3::Widget *widget(int X,int Y,int W,int H) {
fltk3::Choice *myo = new fltk3::Choice(X,Y,W,H,"choice:");
myo->menu(dummymenu);
@@ -766,7 +766,7 @@
if (w < (15 + h)) w = 15 + h;
}
virtual const char *type_name() {return "fltk3::InputChoice";}
- virtual const char *alt_type_name() {return "fltk::ComboBox";}
+ virtual const char *alt_type_name() {return "Fl_Input_Choice";}
virtual Fl_Type* click_test(int,int);
fltk3::Widget *widget(int X,int Y,int W,int H) {
fltk3::InputChoice *myo = new fltk3::InputChoice(X,Y,W,H,"input choice:");
@@ -790,7 +790,7 @@
if (h < 15) h = 15;
}
virtual const char *type_name() {return "fltk3::MenuBar";}
- virtual const char *alt_type_name() {return "fltk::MenuBar";}
+ virtual const char *alt_type_name() {return "Fl_Menu_Bar";}
fltk3::Widget *widget(int X,int Y,int W,int H) {return new
fltk3::MenuBar(X,Y,W,H);}
Fl_Widget_Type *_make() {return new Fl_Menu_Bar_Type();}
int pixmapID() { return 17; }
Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-22 21:38:26 UTC
(rev 8718)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-22 22:43:15 UTC
(rev 8719)
@@ -69,7 +69,7 @@
if (l->is_class()) return "fltk3::Group";
if (p->o->type() == fltk3::WINDOW+1) return "fltk3::DoubleWindow";
if (strcmp(p->type_name(), "fltk3::Input") == 0) {
- if (p->o->type() == fltk3::FLOAT_INPUT) return "Fl_Float_Input";
+ if (p->o->type() == fltk3::FLOAT_INPUT) return "fltk3::FloatInput";
if (p->o->type() == fltk3::INT_INPUT) return "fltk3::IntInput";
}
}
@@ -1975,7 +1975,7 @@
void Fl_Widget_Type::write_static() {
const char* t = subclassname(this);
- if (!subclass() || (is_class() && !strncmp(t, "Fl_", 3))) {
+ if (!subclass() || (is_class() && !strncmp(t, "fltk3::", 7))) {
write_declare("#include <fltk3/%s.h>", t);
}
for (int n=0; n < NUM_EXTRA_CODE; n++) {
Modified: branches/branch-3.0/fluid/Fluid_Image.cxx
===================================================================
--- branches/branch-3.0/fluid/Fluid_Image.cxx 2011-05-22 21:38:26 UTC (rev
8718)
+++ branches/branch-3.0/fluid/Fluid_Image.cxx 2011-05-22 22:43:15 UTC (rev
8719)
@@ -57,7 +57,7 @@
// Write Pixmap data...
write_c("\n");
if (pixmap_header_written != write_number) {
- write_c("#include <fltk3/fltk3::Pixmap.h>\n");
+ write_c("#include <fltk3/Pixmap.h>\n");
pixmap_header_written = write_number;
}
write_c("static const char *%s[] = {\n",
@@ -90,14 +90,14 @@
// Write Bitmap data...
write_c("\n");
if (bitmap_header_written != write_number) {
- write_c("#include <fltk3/Fl_Bitmap.h>\n");
+ write_c("#include <fltk3/fltk3::Bitmap.h>\n");
bitmap_header_written = write_number;
}
write_c("static unsigned char %s[] =\n",
unique_id(this, "idata", fl_filename_name(name()), 0));
write_cdata(img->data()[0], ((img->w() + 7) / 8) * img->h());
write_c(";\n");
- write_c("static Fl_Bitmap %s(%s, %d, %d);\n",
+ write_c("static fltk3::Bitmap %s(%s, %d, %d);\n",
unique_id(this, "image", fl_filename_name(name()), 0),
unique_id(this, "idata", fl_filename_name(name()), 0),
img->w(), img->h());
@@ -105,7 +105,7 @@
// Write jpeg image data...
write_c("\n");
if (jpeg_header_written != write_number) {
- write_c("#include <fltk3/Fl_JPEG_Image.h>\n");
+ write_c("#include <fltk3/JPEGImage.h>\n");
jpeg_header_written = write_number;
}
write_c("static unsigned char %s[] =\n",
@@ -128,7 +128,7 @@
}
write_c(";\n");
- write_c("static Fl_JPEG_Image %s(\"%s\", %s);\n",
+ write_c("static fltk3::JPEGImage %s(\"%s\", %s);\n",
unique_id(this, "image", fl_filename_name(name()), 0),
fl_filename_name(name()),
unique_id(this, "idata", fl_filename_name(name()), 0));
@@ -136,14 +136,14 @@
// Write image data...
write_c("\n");
if (image_header_written != write_number) {
- write_c("#include <fltk3/Fl_Image.h>\n");
+ write_c("#include <fltk3/fltk3::Image.h>\n");
image_header_written = write_number;
}
write_c("static unsigned char %s[] =\n",
unique_id(this, "idata", fl_filename_name(name()), 0));
write_cdata(img->data()[0], (img->w() * img->d() + img->ld()) * img->h());
write_c(";\n");
- write_c("static Fl_RGB_Image %s(%s, %d, %d, %d, %d);\n",
+ write_c("static fltk3::RGBImage %s(%s, %d, %d, %d, %d);\n",
unique_id(this, "image", fl_filename_name(name()), 0),
unique_id(this, "idata", fl_filename_name(name()), 0),
img->w(), img->h(), img->d(), img->ld());
Modified: branches/branch-3.0/fluid/factory.cxx
===================================================================
--- branches/branch-3.0/fluid/factory.cxx 2011-05-22 21:38:26 UTC (rev
8718)
+++ branches/branch-3.0/fluid/factory.cxx 2011-05-22 22:43:15 UTC (rev
8719)
@@ -78,7 +78,7 @@
class Fl_Box_Type : public Fl_Widget_Type {
public:
virtual const char *type_name() {return "fltk3::Box";}
- virtual const char *alt_type_name() {return "fltk::Widget";}
+ virtual const char *alt_type_name() {return "Fl_Box";}
fltk3::Widget *widget(int x,int y,int w, int h) {
return new fltk3::Box(x,y,w,h,"label");}
Fl_Widget_Type *_make() {return new Fl_Box_Type();}
@@ -103,7 +103,7 @@
h = (h / 5) * 5;
}
virtual const char *type_name() {return "fltk3::Button";}
- virtual const char *alt_type_name() {return "fltk::Button";}
+ virtual const char *alt_type_name() {return "Fl_Button";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Button(x,y,w,h,"button");}
Fl_Widget_Type *_make() {return new Fl_Button_Type();}
@@ -124,7 +124,7 @@
w += W + 8 - o->labelsize();
}
virtual const char *type_name() {return "fltk3::ReturnButton";}
- virtual const char *alt_type_name() {return "fltk::ReturnButton";}
+ virtual const char *alt_type_name() {return "Fl_Return_Button";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::ReturnButton(x,y,w,h,"button");}
Fl_Widget_Type *_make() {return new Fl_Return_Button_Type();}
@@ -138,7 +138,7 @@
class Fl_Repeat_Button_Type : public Fl_Widget_Type {
public:
virtual const char *type_name() {return "fltk3::RepeatButton";}
- virtual const char *alt_type_name() {return "fltk::RepeatButton";}
+ virtual const char *alt_type_name() {return "Fl_Repeat_Button";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::RepeatButton(x,y,w,h,"button");}
Fl_Widget_Type *_make() {return new Fl_Repeat_Button_Type();}
@@ -156,7 +156,7 @@
w += 4;
}
virtual const char *type_name() {return "fltk3::LightButton";}
- virtual const char *alt_type_name() {return "fltk::LightButton";}
+ virtual const char *alt_type_name() {return "Fl_Light_Button";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::LightButton(x,y,w,h,"button");}
Fl_Widget_Type *_make() {return new Fl_Light_Button_Type();}
@@ -174,7 +174,7 @@
w += 4;
}
virtual const char *type_name() {return "fltk3::CheckButton";}
- virtual const char *alt_type_name() {return "fltk::CheckButton";}
+ virtual const char *alt_type_name() {return "Fl_Check_Button";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::CheckButton(x,y,w,h,"button");}
Fl_Widget_Type *_make() {return new Fl_Check_Button_Type();}
@@ -192,7 +192,7 @@
w += 4;
}
virtual const char *type_name() {return "fltk3::RoundButton";}
- virtual const char *alt_type_name() {return "fltk::RadioButton";}
+ virtual const char *alt_type_name() {return "Fl_Round_Button";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::RoundButton(x,y,w,h,"button");}
Fl_Widget_Type *_make() {return new Fl_Round_Button_Type();}
@@ -231,7 +231,7 @@
if (w < 50) w = 50;
}
virtual const char *type_name() {return "fltk3::Browser";}
- virtual const char *alt_type_name() {return "fltk::Browser";}
+ virtual const char *alt_type_name() {return "Fl_Browser";}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::Browser* b = new fltk3::Browser(x,y,w,h);
// fltk3::Browser::add calls fltk3::height(), which requires the X display
open.
@@ -279,7 +279,7 @@
if (w < 50) w = 50;
}
virtual const char *type_name() {return "fltk3::CheckBrowser";}
- virtual const char *alt_type_name() {return "fltk::CheckBrowser";}
+ virtual const char *alt_type_name() {return "Fl_Check_Browser";}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::CheckBrowser* b = new fltk3::CheckBrowser(x,y,w,h);
// fltk3::CheckBrowser::add calls fltk3::height(), which requires the X
display open.
@@ -317,7 +317,7 @@
if (w < 80) w = 80;
}
virtual const char *type_name() {return "fltk3::Tree";}
- virtual const char *alt_type_name() {return "fltk::TreeBrowser";}
+ virtual const char *alt_type_name() {return "Fl_Tree";}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::Tree* b = new fltk3::Tree(x,y,w,h);
if (!compile_only) {
@@ -354,7 +354,7 @@
if (w < 50) w = 50;
}
virtual const char *type_name() {return "fltk3::FileBrowser";}
- virtual const char *alt_type_name() {return "fltk::FileBrowser";}
+ virtual const char *alt_type_name() {return "Fl_File_Browser";}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::FileBrowser* b = new fltk3::FileBrowser(x,y,w,h);
// fltk3::FileBrowser::add calls fltk3::height(), which requires the X
display open.
@@ -395,7 +395,7 @@
int pixmapID() { return 41; }
public:
virtual const char *type_name() {return "fltk3::Counter";}
- virtual const char *alt_type_name() {return "fltk::Counter";}
+ virtual const char *alt_type_name() {return "Fl_Counter";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Counter(x,y,w,h,"counter:");}
Fl_Widget_Type *_make() {return new Fl_Counter_Type();}
@@ -437,7 +437,7 @@
if (w < 40) w = 40 ;
}
virtual const char *type_name() {return "fltk3::Spinner";}
- virtual const char *alt_type_name() {return "fltk::Spinner";}
+ virtual const char *alt_type_name() {return "Fl_Spinner";}
int is_spinner() const { return 1; }
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Spinner(x,y,w,h,"spinner:");}
@@ -482,7 +482,7 @@
if (w < 15) w = 15;
}
virtual const char *type_name() {return "fltk3::Input";}
- virtual const char *alt_type_name() {return "fltk::Input";}
+ virtual const char *alt_type_name() {return "Fl_Input";}
int is_input() const {return 1;}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::Input *myo = new fltk3::Input(x,y,w,h,"input:");
@@ -532,7 +532,7 @@
if (w < 50) w = 50;
}
virtual const char *type_name() {return "fltk3::FileInput";}
- virtual const char *alt_type_name() {return "fltk::FileInput";}
+ virtual const char *alt_type_name() {return "Fl_File_Input";}
int is_input() const {return 1;}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::FileInput *myo = new fltk3::FileInput(x,y,w,h,"file:");
@@ -575,7 +575,7 @@
if (w < 50) w = 50;
}
virtual const char *type_name() {return "fltk3::TextDisplay";}
- virtual const char *alt_type_name() {return "fltk::TextDisplay";}
+ virtual const char *alt_type_name() {return "Fl_Text_Display";}
int is_text_display() const {return 1;}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::TextDisplay *myo = new fltk3::TextDisplay(x,y,w,h);
@@ -617,7 +617,7 @@
if (w < 50) w = 50;
}
virtual const char *type_name() {return "fltk3::TextEditor";}
- virtual const char *alt_type_name() {return "fltk::TextEditor";}
+ virtual const char *alt_type_name() {return "Fl_Text_Editor";}
int is_text_display() const {return 1;}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::TextEditor *myo = new fltk3::TextEditor(x,y,w,h);
@@ -646,7 +646,7 @@
class Fl_Clock_Type : public Fl_Widget_Type {
public:
virtual const char *type_name() {return "fltk3::Clock";}
- virtual const char *alt_type_name() {return "fltk::Clock";}
+ virtual const char *alt_type_name() {return "Fl_Clock";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Clock(x,y,w,h);}
Fl_Widget_Type *_make() {return new Fl_Clock_Type();}
@@ -672,7 +672,7 @@
if (w < 50) w = 50;
}
virtual const char *type_name() {return "fltk3::HelpView";}
- virtual const char *alt_type_name() {return "fltk::HelpView";}
+ virtual const char *alt_type_name() {return "Fl_Help_View";}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::HelpView *myo = new fltk3::HelpView(x,y,w,h);
if (!compile_only) {
@@ -691,7 +691,7 @@
class Fl_Progress_Type : public Fl_Widget_Type {
public:
virtual const char *type_name() {return "fltk3::Progress";}
- virtual const char *alt_type_name() {return "fltk::ProgressBar";}
+ virtual const char *alt_type_name() {return "Fl_Progress";}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::Progress *myo = new fltk3::Progress(x,y,w,h,"label");
myo->value(50);
@@ -708,7 +708,7 @@
int is_valuator() const {return 1;}
public:
virtual const char *type_name() {return "fltk3::Adjuster";}
- virtual const char *alt_type_name() {return "fltk::Adjuster";}
+ virtual const char *alt_type_name() {return "Fl_Adjuster";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Adjuster(x,y,w,h);}
Fl_Widget_Type *_make() {return new Fl_Adjuster_Type();}
@@ -729,7 +729,7 @@
int is_valuator() const {return 1;}
public:
virtual const char *type_name() {return "fltk3::Dial";}
- virtual const char *alt_type_name() {return "fltk::Dial";}
+ virtual const char *alt_type_name() {return "Fl_Dial";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Dial(x,y,w,h);}
Fl_Widget_Type *_make() {return new Fl_Dial_Type();}
@@ -749,7 +749,7 @@
int is_valuator() const {return 1;}
public:
virtual const char *type_name() {return "fltk3::Roller";}
- virtual const char *alt_type_name() {return "fltk::Roller";}
+ virtual const char *alt_type_name() {return "Fl_Roller";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Roller(x,y,w,h);}
Fl_Widget_Type *_make() {return new Fl_Roller_Type();}
@@ -773,7 +773,7 @@
int is_valuator() const {return 2;}
public:
virtual const char *type_name() {return "fltk3::Slider";}
- virtual const char *alt_type_name() {return "fltk::Slider";}
+ virtual const char *alt_type_name() {return "Fl_Slider";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Slider(x,y,w,h,"slider:");}
Fl_Widget_Type *_make() {return new Fl_Slider_Type();}
@@ -790,7 +790,7 @@
int is_valuator() const {return 3;}
public:
virtual const char *type_name() {return "fltk3::Scrollbar";}
- virtual const char *alt_type_name() {return "fltk::Scrollbar";}
+ virtual const char *alt_type_name() {return "Fl_Scrollbar";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::Scrollbar(x,y,w,h);}
Fl_Widget_Type *_make() {return new Fl_Scrollbar_Type();}
@@ -819,7 +819,7 @@
if (w < 15) w = 15;
}
virtual const char *type_name() {return "fltk3::Output";}
- virtual const char *alt_type_name() {return "fltk::Output";}
+ virtual const char *alt_type_name() {return "Fl_Output";}
fltk3::Widget *widget(int x,int y,int w,int h) {
fltk3::Output *myo = new fltk3::Output(x,y,w,h,"output:");
myo->value("Text Output");
@@ -846,7 +846,7 @@
if (w < 15) w = 15;
}
virtual const char *type_name() {return "fltk3::ValueInput";}
- virtual const char *alt_type_name() {return "fltk::ValueInput";}
+ virtual const char *alt_type_name() {return "Fl_Value_Input";}
int textstuff(int w, fltk3::Font& f, int& s, fltk3::Color& c);
int is_valuator() const {return 1;}
int is_value_input() const {return 1;}
@@ -887,7 +887,7 @@
if (w < 15) w = 15;
}
virtual const char *type_name() {return "fltk3::ValueOutput";}
- virtual const char *alt_type_name() {return "fltk::ValueOutput";}
+ virtual const char *alt_type_name() {return "Fl_Value_Output";}
int textstuff(int w, fltk3::Font& f, int& s, fltk3::Color& c);
int is_valuator() const {return 1;}
fltk3::Widget *widget(int x,int y,int w,int h) {
@@ -918,7 +918,7 @@
int textstuff(int w, fltk3::Font& f, int& s, fltk3::Color& c);
public:
virtual const char *type_name() {return "fltk3::ValueSlider";}
- virtual const char *alt_type_name() {return "fltk::ValueSlider";}
+ virtual const char *alt_type_name() {return "Fl_Value_Slider";}
fltk3::Widget *widget(int x,int y,int w,int h) {
return new fltk3::ValueSlider(x,y,w,h,"slider:");}
Fl_Widget_Type *_make() {return new Fl_Value_Slider_Type();}
@@ -990,7 +990,7 @@
int w = 0, h = 0;
wt->ideal_size(w, h);
- if (!strcmp(wt->type_name(), "fltk3::MenuBar")) {
+ if (!strcmp(wt->type_name(), "Fl_Menu_Bar")) {
// Move and resize the menubar across the top of the window...
wt->o->resize(0, 0, w, h);
} else {
@@ -1110,8 +1110,8 @@
make_iconlabel( m, pixmap[t->pixmapID()], m->label() );
} else {
const char *n = t->type_name();
+ if (!strncmp(n,"fltk3::",7)) n += 7;
if (!strncmp(n,"Fl_",3)) n += 3;
- if (!strncmp(n,"fltk::",6)) n += 6;
make_iconlabel( m, pixmap[t->pixmapID()], n );
}
}
Modified: branches/branch-3.0/fluid/function_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/function_panel.cxx 2011-05-22 21:38:26 UTC
(rev 8718)
+++ branches/branch-3.0/fluid/function_panel.cxx 2011-05-22 22:43:15 UTC
(rev 8719)
@@ -811,7 +811,7 @@
{ fltk3::Button* o = new fltk3::Button(89, 55, 24, 24);
o->tooltip("Tile");
o->box(fltk3::THIN_UP_BOX);
- o->callback((fltk3::Callback*)type_make_cb, (void*)("Fl_Tile"));
+ o->callback((fltk3::Callback*)type_make_cb,
(void*)("fltk3::TiledGroup"));
o->image(pixmap[20]);
} // fltk3::Button* o
{ fltk3::Button* o = new fltk3::Button(114, 55, 24, 24);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
