diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2005-02-06 16:28:36 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2005-02-06 16:28:36 +0000 |
| commit | 53e7546c23bc7ca8d33f1728fbd2c6f6f2b29a77 (patch) | |
| tree | 5e9f8da90d059bf616044c16bdd14638784fe255 /src/Fl_Sys_Menu_Bar.cxx | |
| parent | f02c5fb4516e6fac11efb142f2f56a8e80baa288 (diff) | |
Fixed a few warnings in OS X. The fluid stuff was 'touche'd, but not changed.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4036 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Sys_Menu_Bar.cxx')
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx index 734ebb98e..636c156dc 100644 --- a/src/Fl_Sys_Menu_Bar.cxx +++ b/src/Fl_Sys_Menu_Bar.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.10 2004/11/21 14:32:22 easysw Exp $" +// "$Id$" // // MacOS system menu bar widget for the Fast Light Tool Kit (FLTK). // @@ -142,6 +142,8 @@ static void setMenuShortcut( MenuHandle mh, int miCnt, const Fl_Menu_Item *m ) SetMenuItemModifiers( mh, miCnt, macMod ); } +#if 0 +// this function needs to be verified before we compile it back in. static void catMenuShortcut( const Fl_Menu_Item *m, char *dst ) { if ( !m->shortcut_ ) @@ -158,6 +160,7 @@ static void catMenuShortcut( const Fl_Menu_Item *m, char *dst ) //if ( isalnum( mm->shortcut_ ) && !( mm->flags & FL_SUBMENU ) ) //sprintf( buf+strlen(buf), "/%c", mm->shortcut_ ); } +#endif static void setMenuFlags( MenuHandle mh, int miCnt, const Fl_Menu_Item *m ) { @@ -188,7 +191,7 @@ static void createSubMenu( MenuHandle mh, int &cnt, pFl_Menu_Item &mm ) int miCnt = 1; while ( mm->text ) { - MenuHandle smh; + MenuHandle smh = 0; buf[1] = 0; catMenuFont( mm, buf+1 ); //catMenuShortcut( mm, buf+1 ); @@ -320,5 +323,5 @@ int Fl_Menu_Bar::handle(int event) { #endif /* __APPLE__ */ // -// End of "$Id: Fl_Sys_Menu_Bar.cxx,v 1.1.2.10 2004/11/21 14:32:22 easysw Exp $". +// End of "$Id$". // |