Implement wxIcon::LoadFile by defering to wxBitmap implementation instead of creating...

[wxWidgets.git] / src / mac / carbon / menu.cpp

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index f3806a6a49c9700642454fc447d52955ebb7a63d..0635f895d9dc6851838d3d0f13a5d4c3d76feab7 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -574,7 +574,9 @@ wxInt32 wxMenu::MacHandleCommandProcess( wxMenuItem* item, int id, wxWindow* tar
     return result;
 }
 
-wxInt32 wxMenu::MacHandleCommandUpdateStatus( wxMenuItem* item, int id, wxWindow* targetWindow )
+wxInt32 wxMenu::MacHandleCommandUpdateStatus(wxMenuItem* WXUNUSED(item),
+                                             int id,
+                                             wxWindow* targetWindow)
 {
     OSStatus result = eventNotHandledErr ;
     wxUpdateUIEvent event(id);
@@ -611,7 +613,7 @@ wxInt32 wxMenu::MacHandleCommandUpdateStatus( wxMenuItem* item, int id, wxWindow
     {
         processed = targetWindow->GetEventHandler()->ProcessEvent(event);
     }
-    
+
     if ( processed )
     {
         // if anything changed, update the changed attribute
@@ -709,12 +711,7 @@ void wxMenuBar::MacInstallMenuBar()
 
     MenuBarHandle menubar = NULL ;
 
-#if TARGET_API_MAC_OSX
     menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ;
-#else
-    menubar = NewHandleClear( 12 ) ;
-    (*menubar)[3] = 0x0a ;
-#endif
 
     ::SetMenuBar( menubar ) ;
     DisposeMenuBar( menubar ) ;
@@ -726,10 +723,8 @@ void wxMenuBar::MacInstallMenuBar()
     // Add About/Preferences separator only on OS X
     // KH/RN: Separator is always present on 10.3 but not on 10.2
     // However, the change from 10.2 to 10.3 suggests it is preferred
-#if TARGET_API_MAC_OSX
     InsertMenuItemTextWithCFString( appleMenu,
                 CFSTR(""), 0, kMenuItemAttrSeparator, 0);
-#endif
     InsertMenuItemTextWithCFString( appleMenu,
                 CFSTR("About..."), 0, 0, 0);
     MacInsertMenu( appleMenu , 0 ) ;