diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-11-10 14:44:43 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-11-10 14:44:43 +0000 |
| commit | cd99974e5138f801c609143693606f55dc9f0c02 (patch) | |
| tree | b7a17012b8c575d4fd20be53903e19c220eb9fcc | |
| parent | 3ad63de2bf9443990b2c6bb50d4afc11a28272ce (diff) | |
Incorporate SUBMENU_POINTER patch from Thomas Wey.
git-svn-id: file:///fltk/svn/fltk/trunk@84 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/Fl_Menu_Type.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index cf37ea481..ff1014817 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -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). // @@ -218,7 +218,10 @@ int Fl_Menu_Item_Type::flags() { if (((Fl_Button*)o)->value()) i |= FL_MENU_VALUE; if (!o->active()) i |= FL_MENU_INACTIVE; 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; 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 $". // |