Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix FLUID menu items with images bug (STR #564)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3910 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2004-11-21 14:53:48 +00:00
parent 33173bf4e5
commit 876e29acef
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.6 CHANGES IN FLTK 1.1.6
- Documentation updates (STR #552, STR #608) - Documentation updates (STR #552, STR #608)
- FLUID didn't display menu items using images properly
(STR #564)
- Fl_Sys_Menu_Bar didn't compile on case-sensitive - Fl_Sys_Menu_Bar didn't compile on case-sensitive
file-systems (STR #622) file-systems (STR #622)
- FLUID didn't handle default function parameters - FLUID didn't handle default function parameters
fluid/Fl_Menu_Type.cxx
+7 -4
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.9 2004/05/15 22:58:18 easysw Exp $" // "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.10 2004/11/21 14:53:48 easysw Exp $"
// //
// Menu item code for the Fast Light Tool Kit (FLTK). // Menu item code for the Fast Light Tool Kit (FLTK).
// //
@@ -339,11 +339,14 @@ void Fl_Menu_Type::build_menu() {
int lvl = level+1; int lvl = level+1;
for (q = next; q && q->level > level; q = q->next) { for (q = next; q && q->level > level; q = q->next) {
Fl_Menu_Item_Type* i = (Fl_Menu_Item_Type*)q; Fl_Menu_Item_Type* i = (Fl_Menu_Item_Type*)q;
m->label(i->o->label()); if (i->o->image()) i->o->image()->label(m);
else {
m->label(i->o->label() ? i->o->label() : "(nolabel)");
m->labeltype(i->o->labeltype());
}
m->shortcut(((Fl_Button*)(i->o))->shortcut()); m->shortcut(((Fl_Button*)(i->o))->shortcut());
m->callback(0,(void*)i); m->callback(0,(void*)i);
m->flags = i->flags(); m->flags = i->flags();
m->labeltype(i->o->labeltype());
m->labelfont(i->o->labelfont()); m->labelfont(i->o->labelfont());
m->labelsize(i->o->labelsize()); m->labelsize(i->o->labelsize());
m->labelcolor(i->o->labelcolor()); m->labelcolor(i->o->labelcolor());
@@ -465,5 +468,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) {
} }
// //
// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.9 2004/05/15 22:58:18 easysw Exp $". // End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.10 2004/11/21 14:53:48 easysw Exp $".
// //