diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.cxx | 9 | ||||
| -rw-r--r-- | src/fl_draw_image_mac.cxx | 4 |
2 files changed, 8 insertions, 5 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$". // diff --git a/src/fl_draw_image_mac.cxx b/src/fl_draw_image_mac.cxx index be4427324..27d3b6312 100644 --- a/src/fl_draw_image_mac.cxx +++ b/src/fl_draw_image_mac.cxx @@ -165,8 +165,8 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, } } #elif defined(__APPLE_QUARTZ__) - void *array = buf; - uchar *tmpBuf; + const void *array = buf; + uchar *tmpBuf = 0; if (cb) { tmpBuf = new uchar[ H*W*delta ]; for (int i=0; i<H; i++) { |