From b47dc05909a5c00ef34847c3550b82eebaaad749 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 9 Jan 2018 21:12:35 +0000 Subject: Fl_Sys_Menu_Bar under MacOS: prevent the FLTK object from receiving events. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12629 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_MacOS_Sys_Menu_Bar.mm | 5 +++++ src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index dcedcd293..fa487d54f 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -44,6 +44,11 @@ static void move_tab_cb(Fl_Widget *, void *data); static void merge_all_windows_cb(Fl_Widget *, void *data); #endif + +void Fl_MacOS_Sys_Menu_Bar_Driver::draw() { + bar->deactivate(); // prevent Fl_Sys_Menu_Bar object from receiving events +} + Fl_MacOS_Sys_Menu_Bar_Driver* Fl_MacOS_Sys_Menu_Bar_Driver::driver() { static Fl_MacOS_Sys_Menu_Bar_Driver *once = new Fl_MacOS_Sys_Menu_Bar_Driver(); if (driver_ != once) { diff --git a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H index 8c332c6cb..d3c06a3da 100644 --- a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H +++ b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H @@ -26,7 +26,7 @@ public: Fl_MacOS_Sys_Menu_Bar_Driver(); virtual ~Fl_MacOS_Sys_Menu_Bar_Driver(); virtual void update(); - virtual void draw() {} + virtual void draw(); virtual void about(Fl_Callback *cb, void *data); virtual int add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags); virtual int add(const char* str); -- cgit v1.2.3