From e756dd8dabca5db59b36027cafb5db1d608f44c2 Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Wed, 22 Jun 2016 07:43:16 +0000 Subject: [PATCH] Changed Fl_Sys_Menu_Bar::update() from protected -> public as per STR #3317 and manolo's commit #11785 to branch-1.3-porting/ git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11793 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Sys_Menu_Bar.H | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index 94bdb7e3c..fe2e7af37 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -39,9 +39,20 @@ You can configure a callback for the 'About' menu item to invoke your own code with fl_mac_set_about(). */ class FL_EXPORT Fl_Sys_Menu_Bar : public Fl_Menu_Bar { + +#if FLTK_ABI_VERSION >= 10304 + // NEW -- update() public (STR#3317) +public: + void update(); +protected: + void draw(); +#else + // OLD -- update() protected protected: void update(); void draw(); +#endif + public: Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0); ~Fl_Sys_Menu_Bar(); @@ -95,7 +106,17 @@ public: #else +#if FLTK_ABI_VERSION >= 10304 +// NEW -- small class for update() +class FL_EXPORT Fl_Sys_Menu_Bar : public Fl_Menu_Bar { +public: + Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0) : Fl_Menu_Bar(x,y,w,h,l) {} + inline void update() {} +}; +#else +// OLD -- simple typedef typedef Fl_Menu_Bar Fl_Sys_Menu_Bar; +#endif #endif // defined(__APPLE__) || defined(FL_DOXYGEN)