diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-01-29 07:52:21 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-01-29 07:52:21 +0000 |
| commit | ef50e095e79e0ecd7077633bf96d13f6ba8f737e (patch) | |
| tree | a9e3bccb1d650722739e2b130368f94b4c4a416b /src | |
| parent | 41195fbba6680eea46cdd0629aa35b3689f53014 (diff) | |
Fixed buttons in the menubar
git-svn-id: file:///fltk/svn/fltk/trunk@255 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Menu.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index b96cd57a7..58048946c 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.14 1999/01/24 15:27:35 mike Exp $" +// "$Id: Fl_Menu.cxx,v 1.15 1999/01/29 07:52:21 bill Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -526,7 +526,9 @@ int menuwindow::handle(int e) { if (p.current_item && !p.current_item->activevisible()) return 1; // Mouse must either be held down/dragged some, or this must be // the second click (not the one that popped up the menu): - if (!Fl::event_is_click() || p.state == PUSH_STATE) p.state = DONE_STATE; + if (!Fl::event_is_click() || p.state == PUSH_STATE || + p.menubar && p.current_item && !p.current_item->submenu() // button + ) p.state = DONE_STATE; return 1; } return Fl_Window::handle(e); @@ -708,5 +710,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.14 1999/01/24 15:27:35 mike Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.15 1999/01/29 07:52:21 bill Exp $". // diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index ae6802edf..5bb70fbe5 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.25 1999/01/24 15:30:32 mike Exp $" +// "$Id: Fl_win32.cxx,v 1.26 1999/01/29 07:52:21 bill Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -641,7 +641,7 @@ Fl_X* Fl_X::make(Fl_Window* w) { case 2: style |= WS_THICKFRAME | WS_MAXIMIZEBOX | WS_CAPTION ; break; } if (by+bt) { - if (!w->modal()) style |= WS_SYSMENU | WS_MINIMIZEBOX; + if (!w->non_modal()) style |= WS_SYSMENU | WS_MINIMIZEBOX; wp += 2*bx; hp += 2*by+bt; } @@ -862,5 +862,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.25 1999/01/24 15:30:32 mike Exp $". +// End of "$Id: Fl_win32.cxx,v 1.26 1999/01/29 07:52:21 bill Exp $". // |