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

Incorporate SUBMENU_POINTER patch from Thomas Wey.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/trunk@84 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
1998-11-10 14:44:43 +00:00
parent 3ad63de2bf
commit cd99974e51
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluid/Fl_Menu_Type.cxx
+6 -3
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Menu_Type.cxx,v 1.2 1998/10/21 16:28:53 mike Exp $" // "$Id: Fl_Menu_Type.cxx,v 1.3 1998/11/10 14:44:43 mike Exp $"
// //
// Menu item code for the Fast Light Tool Kit (FLTK). // Menu item code for the Fast Light Tool Kit (FLTK).
// //
@@ -218,7 +218,10 @@ int Fl_Menu_Item_Type::flags() {
if (((Fl_Button*)o)->value()) i |= FL_MENU_VALUE; if (((Fl_Button*)o)->value()) i |= FL_MENU_VALUE;
if (!o->active()) i |= FL_MENU_INACTIVE; if (!o->active()) i |= FL_MENU_INACTIVE;
if (!o->visible()) i |= FL_MENU_INVISIBLE; if (!o->visible()) i |= FL_MENU_INVISIBLE;
if (is_parent()) i |= FL_SUBMENU; if (is_parent()) {
if (user_data() == NULL) i |= FL_SUBMENU;
else i |= FL_SUBMENU_POINTER;
}
if (hotspot()) i |= FL_MENU_DIVIDER; if (hotspot()) i |= FL_MENU_DIVIDER;
return i; return i;
} }
@@ -510,5 +513,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) {
} }
// //
// End of "$Id: Fl_Menu_Type.cxx,v 1.2 1998/10/21 16:28:53 mike Exp $". // End of "$Id: Fl_Menu_Type.cxx,v 1.3 1998/11/10 14:44:43 mike Exp $".
// //