X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/653a3ed956ba34af1113bab54789151f7e04e064..ee5749a6c12fa19f965f0918ece29e768486a99d:/src/mac/app.cpp diff --git a/src/mac/app.cpp b/src/mac/app.cpp index b100ef0b8c..b09fd3b848 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -38,10 +38,6 @@ #include "wx/menu.h" #include "wx/docview.h" -#if wxUSE_WX_RESOURCES -# include "wx/resource.h" -#endif - #include // mac @@ -86,8 +82,6 @@ static EventTime sleepTime = kEventDurationNoWait ; static long sleepTime = 0 ; #endif -wxApp *wxTheApp = NULL; - #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) @@ -116,7 +110,7 @@ bool wxApp::s_macSupportPCMenuShortcuts = true ; long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; long wxApp::s_macPreferencesMenuItemId = 0 ; long wxApp::s_macExitMenuItemId = wxID_EXIT ; -wxString wxApp::s_macHelpMenuTitleName = "&Help" ; +wxString wxApp::s_macHelpMenuTitleName = wxT("&Help") ; //---------------------------------------------------------------------- // Core Apple Event Support @@ -162,16 +156,16 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); if (err != noErr) return err; - + err = AECountItems(&docList, &itemsInList); if (err != noErr) return err; - + ProcessSerialNumber PSN ; PSN.highLongOfPSN = 0 ; PSN.lowLongOfPSN = kCurrentProcess ; SetFrontProcess( &PSN ) ; - + for (i = 1; i <= itemsInList; i++) { AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType, (Ptr) & theSpec, sizeof(theSpec), &actualSize); @@ -196,16 +190,16 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply) err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList); if (err != noErr) return err; - + err = AECountItems(&docList, &itemsInList); if (err != noErr) return err; - + ProcessSerialNumber PSN ; PSN.highLongOfPSN = 0 ; PSN.lowLongOfPSN = kCurrentProcess ; SetFrontProcess( &PSN ) ; - + for (i = 1; i <= itemsInList; i++) { AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType, (Ptr) & theSpec, sizeof(theSpec), &actualSize); @@ -223,7 +217,7 @@ short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU return noErr ; } -// AEQuit attempts to quite the application +// AEQuit attempts to quit the application short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { @@ -289,45 +283,42 @@ void wxApp::MacNewFile() #if TARGET_CARBON - static const EventTypeSpec eventList[] = + static const EventTypeSpec eventList[] = { { kEventClassCommand, kEventProcessCommand } , { kEventClassCommand, kEventCommandUpdateStatus } , - + { kEventClassApplication , kEventAppActivated } , { kEventClassApplication , kEventAppDeactivated } , // handling the quit event is not recommended by apple // rather using the quit apple event - which we do - + { kEventClassAppleEvent , kEventAppleEvent } , - + { kEventClassMouse , kEventMouseDown } , { 'WXMC' , 'WXMC' } } ; static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - OSStatus result = eventNotHandledErr ; - UInt32 kind = GetEventKind( event ) ; - - return result ; + return eventNotHandledErr ; } -// due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop +// due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop // but have to use ReceiveNextEvent dealing with events manually, therefore we also have // deal with clicks in the menu bar explicitely static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { OSStatus result = eventNotHandledErr ; - + switch( GetEventKind(event) ) { case kEventMouseDown : { Point point ; WindowRef window ; - + GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof( Point ), NULL, &point ); short windowPart = ::FindWindow(point, &window); @@ -339,7 +330,7 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef } } break ; - } + } return result ; } @@ -349,14 +340,14 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR OSStatus result = eventNotHandledErr ; HICommand command ; - + GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL, sizeof( HICommand ), NULL, &command ); MenuCommand id = command.commandID ; if ( id == kHICommandPreferences ) id = wxApp::s_macPreferencesMenuItemId ; - + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; wxMenu* menu = NULL ; wxMenuItem* item = NULL ; @@ -366,7 +357,7 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR if ( item == NULL || menu == NULL || mbar == NULL ) return result ; - + switch( GetEventKind( event ) ) { case kEventProcessCommand : @@ -375,7 +366,7 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR { item->Check( !item->IsChecked() ) ; } - + menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; result = noErr ; } @@ -386,8 +377,8 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR break ; default : break ; - } - + } + return result ; } @@ -398,13 +389,15 @@ static pascal OSStatus ApplicationEventHandler( EventHandlerCallRef handler , Ev { case kEventAppActivated : { - wxTheApp->MacResume( true ) ; + if ( wxTheApp ) + wxTheApp->MacResume( true ) ; result = noErr ; } break ; case kEventAppDeactivated : { - wxTheApp->MacSuspend( true ) ; + if ( wxTheApp ) + wxTheApp->MacSuspend( true ) ; result = noErr ; } break ; @@ -454,7 +447,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxAppEventHandler ) WXIMPORT char std::__throws_bad_alloc ; #endif -bool wxApp::Initialize() +bool wxApp::Initialize(int& argc, wxChar **argv) { int error = 0 ; @@ -538,72 +531,50 @@ bool wxApp::Initialize() #endif #endif + wxMacSetupConverters() ; s_macCursorRgn = ::NewRgn() ; - wxClassInfo::InitializeClasses(); - -#if wxUSE_RESOURCES -// wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); -#endif - -#if wxUSE_THREADS - wxPendingEventsLocker = new wxCriticalSection; -#endif - - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); - -#ifdef __WXDEBUG__ -#if wxUSE_LOG - // flush the logged messages if any and install a 'safer' log target: the - // default one (wxLogGui) can't be used after the resources are freed just - // below and the user suppliedo ne might be even more unsafe (using any - // wxWindows GUI function is unsafe starting from now) - wxLog::DontCreateOnDemand(); - - // this will flush the old messages if any - delete wxLog::SetActiveTarget(new wxLogStderr); -#endif // wxUSE_LOG -#endif - - wxWinMacWindowList = new wxList(wxKEY_INTEGER); - wxWinMacControlList = new wxList(wxKEY_INTEGER); - - wxInitializeStockLists(); - wxInitializeStockObjects(); - -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif + // Mac OS X passes a process serial number command line argument when + // the application is launched from the Finder. This argument must be + // removed from the command line arguments before being handled by the + // application (otherwise applications would need to handle it) + if ( argc > 1 ) + { + static const wxChar *ARG_PSN = _T("-psn_"); + if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 ) + { + // remove this argument + memmove(argv, argv + 1, argc--); + } + } - wxBitmap::InitStandardHandlers(); + if ( !wxAppBase::Initialize(argc, argv) ) + return false; - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) { - return FALSE; - } + wxWinMacWindowList = new wxList(wxKEY_INTEGER); + wxWinMacControlList = new wxList(wxKEY_INTEGER); - wxMacCreateNotifierTable() ; + wxMacCreateNotifierTable() ; - UMAShowArrowCursor() ; + UMAShowArrowCursor() ; - return TRUE; + return true; } bool wxApp::OnInitGui() { if( !wxAppBase::OnInitGui() ) return false ; - -#if TARGET_CARBON + +#if TARGET_CARBON InstallStandardEventHandler( GetApplicationEventTarget() ) ; - + InstallApplicationEventHandler( - GetwxAppEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, wxTheApp, &((EventHandlerRef)wxTheApp->m_macEventHandler)); + GetwxAppEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler)); #endif - + #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerUPP(AEHandleODoc) , @@ -638,87 +609,31 @@ bool wxApp::OnInitGui() void wxApp::CleanUp() { wxToolTip::RemoveToolTips() ; -#if wxUSE_LOG - // flush the logged messages if any and install a 'safer' log target: the - // default one (wxLogGui) can't be used after the resources are freed just - // below and the user suppliedo ne might be even more unsafe (using any - // wxWindows GUI function is unsafe starting from now) - wxLog::DontCreateOnDemand(); - - // this will flush the old messages if any - delete wxLog::SetActiveTarget(new wxLogStderr); -#endif // wxUSE_LOG // One last chance for pending objects to be cleaned up wxTheApp->DeletePendingObjects(); - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - - wxDeleteStockObjects() ; - - // Destroy all GDI lists, etc. - wxDeleteStockLists(); - - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; - - wxBitmap::CleanUpHandlers(); - wxMacDestroyNotifierTable() ; - if (wxWinMacWindowList) { - delete wxWinMacWindowList ; - } - if (wxWinMacControlList) { - delete wxWinMacControlList ; - } - delete wxPendingEvents; -#if wxUSE_THREADS - delete wxPendingEventsLocker; - // If we don't do the following, we get an apparent memory leak. - ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); -#endif + delete wxWinMacWindowList ; + wxWinMacWindowList = NULL; - wxClassInfo::CleanUpClasses(); + delete wxWinMacControlList ; + wxWinMacControlList = NULL; #ifndef __DARWIN__ # if __option(profile) - ProfilerDump( "\papp.prof" ) ; + ProfilerDump( (StringPtr)"\papp.prof" ) ; ProfilerTerm() ; # endif #endif - delete wxTheApp; - wxTheApp = NULL; - -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft(TRUE) > 0) - { - wxLogDebug(wxT("There were memory leaks.")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - // wxDebugContext::SetStream(NULL, NULL); -#endif - -#if wxUSE_LOG - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG - #if defined(WXMAKINGDLL) && defined(__DARWIN__) // close shared library resources from here since we don't have // __wxterminate in Mach-O shared libraries wxStAppResource::CloseSharedLibraryResource(); #endif + wxMacCleanupConverters() ; UMACleanupToolbox() ; if (s_macCursorRgn) { @@ -728,10 +643,12 @@ void wxApp::CleanUp() #if 0 TerminateAE() ; #endif + + wxAppBase::CleanUp(); } //---------------------------------------------------------------------- -// wxEntry +// misc initialization stuff //---------------------------------------------------------------------- // extern variable for shared library resource id @@ -807,8 +724,15 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) theModule = NSModuleForSymbol(theSymbol); theLibPath = NSLibraryNameForModule(theModule); + // if we call wxLogDebug from here then, as wxTheApp hasn't been + // created yet when we're called from wxApp::Initialize(), wxLog + // is going to create a default stderr-based log target instead of + // the expected normal GUI one -- don't do it, if we really want + // to see this message just use fprintf() here +#if 0 wxLogDebug( wxT("wxMac library installation name is '%s'"), theLibPath ); +#endif // allocate copy to replace .dylib.* extension with .rsrc theResPath = strdup(theLibPath); @@ -823,8 +747,10 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) // overwrite extension with ".rsrc" strcpy(theExt, ".rsrc"); +#if 0 wxLogDebug( wxT("wxMac resources file name is '%s'"), theResPath ); +#endif theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false); if (theErr != noErr) { @@ -838,8 +764,11 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) &gSharedLibraryResource); } if (theErr != noErr) { - wxLogDebug( wxT("unable to open wxMac resource file '%s'"), - theResPath ); +#ifdef __WXDEBUG__ + fprintf(stderr, + wxT("unable to open wxMac resource file '%s'\n"), + theResPath ); +#endif // __WXDEBUG__ } // free duplicated resource file path @@ -898,116 +827,6 @@ pascal void __wxterminate(void) #endif /* WXMAKINGDLL && !__DARWIN__ */ -int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char *WXUNUSED(argv)[] ) -{ - return wxApp::Initialize(); -} - -int WXDLLEXPORT wxEntryInitGui() -{ - return wxTheApp->OnInitGui(); -} - -void WXDLLEXPORT wxEntryCleanup() -{ - wxApp::CleanUp(); -} - -int wxEntry( int argc, char *argv[] , bool enterLoop ) -{ -#ifdef __MWERKS__ -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // This seems to be necessary since there are 'rogue' - // objects present at this point (perhaps global objects?) - // Setting a checkpoint will ignore them as far as the - // memory checking facility is concerned. - // Of course you may argue that memory allocated in globals should be - // checked, but this is a reasonable compromise. - wxDebugContext::SetCheckpoint(); -#endif -#endif - if (!wxEntryStart(argc, argv)) { - return 0; - } - // create the application object or ensure that one already exists - if (!wxTheApp) - { - // The app may have declared a global application object, but we recommend - // the IMPLEMENT_APP macro is used instead, which sets an initializer - // function for delayed, dynamic app object construction. - wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, - wxT("No initializer - use IMPLEMENT_APP macro.") ); - - wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) (); - } - - wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); - -#ifdef __DARWIN__ - // Mac OS X passes a process serial number command line argument when - // the application is launched from the Finder. This argument must be - // removed from the command line arguments before being handled by the - // application (otherwise applications would need to handle it) - - if (argc > 1) { - if (strncmp(argv[1], "-psn_", 5) == 0) { - // assume the argument is always the only one and remove it - --argc; - } - } -#else - argc = 0 ; // currently we don't support files as parameters -#endif - // we could try to get the open apple events here to adjust argc and argv better - - wxTheApp->argc = argc; - wxTheApp->argv = argv; - - // GUI-specific initialization, such as creating an app context. - wxEntryInitGui(); - - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - int retValue = 0; - - if ( wxTheApp->OnInit() ) - { - if ( enterLoop ) - { - retValue = wxTheApp->OnRun(); - } - else - // We want to initialize, but not run or exit immediately. - return 1; - } - //else: app initialization failed, so we skipped OnRun() - - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if ( topWindow ) - { - // Forcibly delete the window. - if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - topWindow->Close(TRUE); - wxTheApp->DeletePendingObjects(); - } - else - { - delete topWindow; - wxTheApp->SetTopWindow(NULL); - } - } - - wxTheApp->OnExit(); - - wxEntryCleanup(); - - return retValue; -} - #if TARGET_CARBON bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) @@ -1120,18 +939,11 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even */ #endif -// Static member initialization -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; - wxApp::wxApp() { m_topWindow = NULL; wxTheApp = this; -#if WXWIN_COMPATIBILITY_2_2 - m_wantDebugOutput = TRUE; -#endif - argc = 0; argv = NULL; @@ -1221,9 +1033,11 @@ void wxApp::OnIdle(wxIdleEvent& event) wxMacProcessNotifierAndPendingEvents(); s_inOnIdle = FALSE; + if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) + wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar(); } -void wxWakeUpIdle() +void wxApp::WakeUpIdle() { wxMacWakeUp() ; } @@ -1268,28 +1082,8 @@ bool wxApp::SendIdleEvents(wxWindow* win) return needMore ; } -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.GetFirst(); - while (node) - { - wxObject *obj = (wxObject *)node->GetData(); - - delete obj; - - if (wxPendingDelete.Member(obj)) - delete node; - - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.GetFirst(); - } -} - -void wxExit() +void wxApp::Exit() { - wxLogError(_("Fatal error: exiting")); - wxApp::CleanUp(); ::ExitToShell() ; } @@ -1346,7 +1140,7 @@ bool wxApp::Yield(bool onlyIfNeeded) s_inReceiveEvent = true ; status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ; s_inReceiveEvent = false ; - + if ( status == eventLoopTimedOutErr ) { // make sure next time the event loop will trigger idle events @@ -1369,7 +1163,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // having a larger value here leads to large performance slowdowns // so we cannot give background apps more processor time here // we do so however having a large sleep value in the main event loop - sleepTime = 0 ; + sleepTime = 0 ; while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn)) { @@ -1398,7 +1192,12 @@ void wxApp::MacSuspend( bool convertClipboard ) while (node) { wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data(); - win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ; +#if TARGET_CARBON +#if 0 // having problems right now with that + if (!win->HasFlag(wxSTAY_ON_TOP)) +#endif +#endif + win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ; node = node->GetNext(); } @@ -1470,6 +1269,7 @@ void wxApp::MacDoOneEvent() { MacHandleOneEvent( theEvent ) ; ReleaseEvent(theEvent); + sleepTime = kEventDurationNoWait ; } #else EventRecord event ; @@ -1707,8 +1507,8 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) &constraintRect , &newContentRect ) ; if ( growResult ) { - win->SetSize( newContentRect.left , newContentRect.top , - newContentRect.right - newContentRect.left , + win->SetSize( newContentRect.left , newContentRect.top , + newContentRect.right - newContentRect.left , newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING); } s_lastMouseDown = 0; @@ -1810,7 +1610,7 @@ void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr ) } } -#endif +#endif long wxMacTranslateKey(unsigned char key, unsigned char code) ; long wxMacTranslateKey(unsigned char key, unsigned char code) @@ -1936,7 +1736,7 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) else { wxWindow* focus = wxWindow::FindFocus() ; - + if ( MacSendKeyDownEvent( focus , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false ) { // has not been handled -> perform default @@ -1974,12 +1774,12 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi { if ( !focus ) return false ; - + short keycode ; short keychar ; keychar = short(keymessage & charCodeMask); keycode = short(keymessage & keyCodeMask) >> 8 ; - + if ( modifiers & ( controlKey|shiftKey|optionKey ) ) { // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier @@ -1997,7 +1797,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi realkeyval = short(keymessage & charCodeMask) ; keyval = wxToupper( keyval ) ; } - + wxKeyEvent event(wxEVT_KEY_DOWN); bool handled = false ; event.m_shiftDown = modifiers & shiftKey; @@ -2122,7 +1922,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier if ( keyval == keychar ) { - keyval = wxToupper( keyval ) ; + keyval = wxToupper( keyval ) ; } bool handled = false ; @@ -2306,9 +2106,9 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) } else { - windowPart = ::FindWindow(ev->where, &window); + windowPart = ::FindWindow(ev->where, &window); } - + switch (windowPart) { case inContent : @@ -2345,21 +2145,13 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) void wxApp::MacHandleMenuCommand( wxUint32 id ) { - wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; - wxMenu* menu = NULL ; - wxMenuItem* item = NULL ; - if ( mbar ) - { - item = mbar->FindItem( id , &menu ) ; - } - wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") ); - - if (item->IsCheckable()) - { - item->Check( !item->IsChecked() ) ; - } - - menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + wxFrame* frame = mbar->GetFrame(); + wxCHECK_RET( mbar != NULL && frame != NULL, wxT("error in menu item callback") ); + if ( frame ) + { + frame->ProcessCommand(id); + } } #if !TARGET_CARBON