copying native cursor under cocoa

[wxWidgets.git] / src / osx / carbon / app.cpp

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index dd7c99fcbff0c8a22bf07d744c546ab0dda8f6be..f4a209b0a78911ff2f73ba4a921c04353a6d3475 100644 (file)
--- 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)
             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
         }
     }
 #endif


@@ -866,20 +866,12 @@ bool wxApp::ProcessIdle()
     return wxAppBase::ProcessIdle();
 }
 
     return wxAppBase::ProcessIdle();
 }
 

-#if wxOSX_USE_COCOA_OR_CARBON
-

 int wxApp::OnRun()
 {
     wxMacAutoreleasePool pool;
     return wxAppBase::OnRun();
 }
 
 int wxApp::OnRun()
 {
     wxMacAutoreleasePool pool;
     return wxAppBase::OnRun();
 }
 

-#else
-
-// iPhone version in utils.mm
-
-#endif
-

 #if wxOSX_USE_CARBON
 bool wxApp::DoInitGui()
 {
 #if wxOSX_USE_CARBON
 bool wxApp::DoInitGui()
 {


@@ -1323,7 +1315,11 @@ int wxMacKeyCodeToModifier(wxKeyCode key)
 }
 #endif
 
 }
 #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()
 {
 
 wxMouseState wxGetMouseState()
 {