Submenu titles did not always get the FL_SUBMENU bit turned on when
the menu array was built. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@545 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
0e29799dda
commit
c319bcae89
@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// "$Id: Fl_Menu_Type.cxx,v 1.16.2.1 1999/03/29 17:39:25 carl Exp $"
|
// "$Id: Fl_Menu_Type.cxx,v 1.16.2.2 1999/04/17 01:33:27 bill Exp $"
|
||||||
//
|
//
|
||||||
// Menu item code for the Fast Light Tool Kit (FLTK).
|
// Menu item code for the Fast Light Tool Kit (FLTK).
|
||||||
//
|
//
|
||||||
@ -324,8 +324,8 @@ void Fl_Menu_Type::build_menu() {
|
|||||||
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());
|
||||||
|
if (q->is_parent()) {lvl++; m->flags |= FL_SUBMENU;}
|
||||||
m++;
|
m++;
|
||||||
if (q->is_parent()) lvl++;
|
|
||||||
int l1 =
|
int l1 =
|
||||||
(q->next && q->next->is_menu_item()) ? q->next->level : level;
|
(q->next && q->next->is_menu_item()) ? q->next->level : level;
|
||||||
while (lvl > l1) {m->label(0); m++; lvl--;}
|
while (lvl > l1) {m->label(0); m++; lvl--;}
|
||||||
@ -442,5 +442,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.1 1999/03/29 17:39:25 carl Exp $".
|
// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.2 1999/04/17 01:33:27 bill Exp $".
|
||||||
//
|
//
|
||||||
|
Loading…
Reference in New Issue
Block a user