From e7736e5df85c741f6607dee0c0e30f9ca3bc4079 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sat, 14 Nov 2009 19:51:27 +0000 Subject: [PATCH] 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 --- src/osx/carbon/app.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index 849eec5073..dd7c99fcbf 100644 --- 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() { -- 2.47.2