X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7736e5df85c741f6607dee0c0e30f9ca3bc4079..cbe067603829728da8852282e895f25b2bccf732:/src/osx/carbon/app.cpp

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index dd7c99fcbf..9560c31dd1 100644
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -513,7 +513,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
             if ( itemMenu != NULL && refCon != 0)
-                item = ((wxMenuItemImpl*) refCon)->GetWXPeer() ;
+                item = (wxMenuItem*) refCon;
         }
     }
 #endif
@@ -1323,7 +1323,11 @@ int wxMacKeyCodeToModifier(wxKeyCode key)
 }
 #endif
 
-#if !wxOSX_USE_IPHONE && !(wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
+#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+
+// defined in utils.mm
+
+#elif wxOSX_USE_COCOA_OR_CARBON
 
 wxMouseState wxGetMouseState()
 {