X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36b960067d3b6ccbccce129e499e04a69854f827..2439f1d96880ed2fd1551b85795ccee1704dc29c:/src/osx/carbon/app.cpp?ds=sidebyside diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index af71ecc6a3..da75c15489 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 @@ -841,7 +841,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) return true; } -#if wxOSX_USE_COCOA_OR_CARBON +#if wxOSX_USE_CARBON bool wxApp::CallOnInit() { wxMacAutoreleasePool autoreleasepool; @@ -866,20 +866,12 @@ bool wxApp::ProcessIdle() return wxAppBase::ProcessIdle(); } -#if wxOSX_USE_COCOA_OR_CARBON - int wxApp::OnRun() { wxMacAutoreleasePool pool; return wxAppBase::OnRun(); } -#else - -// iPhone version in utils.mm - -#endif - #if wxOSX_USE_CARBON bool wxApp::DoInitGui() {