Fix typo that broke compilation and adjust the defines to avoid an empty #if.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index 849eec50732371d7254d95f371730756b0da3182..dd7c99fcbff0c8a22bf07d744c546ab0dda8f6be 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -1323,11 +1323,7 @@ int wxMacKeyCodeToModifier(wxKeyCode key)
 }
 #endif
 
-#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
-
-// defined in utils.mm
-
-#elif wxOSX_USE_CARBON_OR_COCOA
+#if !wxOSX_USE_IPHONE && !(wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
 
 wxMouseState wxGetMouseState()
 {