diff options
| -rw-r--r-- | fluid/factory.cxx | 14 | ||||
| -rw-r--r-- | fluid/makedepend | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/fluid/factory.cxx b/fluid/factory.cxx index cf7f653d4..748fda429 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -1,5 +1,5 @@ // -// "$Id: factory.cxx,v 1.4.2.11.2.9 2002/10/30 21:06:18 matthiaswm Exp $" +// "$Id: factory.cxx,v 1.4.2.11.2.10 2002/10/30 22:30:30 matthiaswm Exp $" // // Widget factory code for the Fast Light Tool Kit (FLTK). // @@ -775,9 +775,9 @@ Fl_Menu_Item New_Menu[] = { static void make_iconlabel( Fl_Menu_Item *mi, Fl_Image *ic, const char *txt ) { if (ic) { - char *t1 = new char (strlen(txt)+2); + char *t1 = new char[strlen(txt)+3]; strcpy( t1, " " ); - strcat( t1, txt ); + strcat(t1, txt); mi->image( ic ); Fl_Multi_Label *ml = new Fl_Multi_Label; ml->labela = (char*)ic; @@ -786,7 +786,7 @@ static void make_iconlabel( Fl_Menu_Item *mi, Fl_Image *ic, const char *txt ) ml->typeb = FL_NORMAL_LABEL; ml->label( mi ); } - else + else if (txt!=mi->text) mi->label(txt); } @@ -794,11 +794,11 @@ void fill_in_New_Menu() { for (unsigned i = 0; i < sizeof(New_Menu)/sizeof(*New_Menu); i++) { Fl_Menu_Item *m = New_Menu+i; if (m->user_data()) { + Fl_Type *t = (Fl_Type*)m->user_data(); if (m->text) { - make_iconlabel( New_Menu+i, pixmap[ ((Fl_Type*)(New_Menu[i].user_data_))->pixmapID() ], New_Menu[i].label() ); + make_iconlabel( m, pixmap[t->pixmapID()], m->label() ); } else { - Fl_Type *t = (Fl_Type*)m->user_data(); const char *n = t->type_name(); if (!strncmp(n,"Fl_",3)) n += 3; make_iconlabel( m, pixmap[t->pixmapID()], n ); @@ -962,5 +962,5 @@ int lookup_symbol(const char *name, int &v, int numberok) { } // -// End of "$Id: factory.cxx,v 1.4.2.11.2.9 2002/10/30 21:06:18 matthiaswm Exp $". +// End of "$Id: factory.cxx,v 1.4.2.11.2.10 2002/10/30 22:30:30 matthiaswm Exp $". // diff --git a/fluid/makedepend b/fluid/makedepend index 00e17c2c5..102eebd13 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -71,7 +71,6 @@ Fl_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H Fl_Type.o: ../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_Menu_Bar.H ../FL/Fl_Pixmap.H lock.xpm -Fl_Type.o: unlock.xpm 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_message.H |