Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-09-24 16:23:46 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Changed Fl_Sys_Menu_Bar::update() from protected -> public

Browse Source 
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
This commit is contained in:
Greg Ercolano
2016-06-22 07:43:16 +00:00
parent 1680285406
commit e756dd8dab
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Sys_Menu_Bar.H
+21
View File
@@ -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)