X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a9858aeb2bcf3aa13dbd0e1c07db9c3d9eca08b..9ed8b5a7b2e41ecb07d2dab32bac32eb7b771fd3:/src/mac/carbon/app.cpp?ds=sidebyside diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 6c327441c2..a48440d002 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/mac/carbon/app.cpp // Purpose: wxApp // Author: Stefan Csomor // Modified by: @@ -11,38 +11,43 @@ #include "wx/wxprec.h" -#include "wx/window.h" -#include "wx/frame.h" -#include "wx/button.h" #include "wx/app.h" -#include "wx/utils.h" -#include "wx/gdicmn.h" -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/cursor.h" -#include "wx/intl.h" -#include "wx/icon.h" -#include "wx/palette.h" -#include "wx/dc.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" -#include "wx/log.h" -#include "wx/module.h" -#include "wx/memory.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/window.h" + #include "wx/frame.h" + #include "wx/dc.h" + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/pen.h" + #include "wx/brush.h" + #include "wx/palette.h" + #include "wx/icon.h" + #include "wx/cursor.h" + #include "wx/dialog.h" + #include "wx/msgdlg.h" + #include "wx/textctrl.h" + #include "wx/memory.h" + #include "wx/gdicmn.h" + #include "wx/module.h" +#endif + #include "wx/tooltip.h" -#include "wx/textctrl.h" -#include "wx/menu.h" #include "wx/docview.h" #include "wx/filename.h" +#include "wx/link.h" #include // mac #ifndef __DARWIN__ - #if __option(profile) - #include - #endif + #if __option(profile) + #include + #endif #endif // #include "apprsrc.h" @@ -63,21 +68,8 @@ # include #endif -extern wxList wxPendingDelete; - -// set wxMAC_USE_RAEL to 1 if RunApplicationEventLoop should be used -// if 0 the lower level CarbonEventLoop will be used -// on the long run RAEL should replace the low level event loop -// we will have to clean up event handling to make sure we don't -// miss handling of things like pending events etc -// perhaps we will also have to pipe events through an ueber-event-handler -// to make sure we have one place to do all these house-keeping functions - -#define wxMAC_USE_RAEL 0 - -#if wxUSE_THREADS -extern size_t g_numberOfThreads; -#endif +// Keep linker from discarding wxStockGDIMac +wxFORCE_LINK_MODULE(gdiobj) // statics for implementation static bool s_inYield = false; @@ -94,17 +86,11 @@ END_EVENT_TABLE() // platform specific static variables -const short kMacMinHeap = (29 * 1024) ; -const short kwxMacMenuBarResource = 1 ; -const short kwxMacAppleMenuId = 1 ; +static const short kwxMacAppleMenuId = 1 ; -WXHRGN wxApp::s_macCursorRgn = NULL; wxWindow* wxApp::s_captureWindow = NULL ; -int wxApp::s_lastMouseDown = 0 ; -long wxApp::sm_lastMessageTime = 0; long wxApp::s_lastModifiers = 0 ; -bool wxApp::s_macSupportPCMenuShortcuts = true ; long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; long wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ; long wxApp::s_macExitMenuItemId = wxID_EXIT ; @@ -116,37 +102,43 @@ bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin // Core Apple Event Support //---------------------------------------------------------------------- -pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ; -pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ; -pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ; -pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ; -pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ; +pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ; +pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ; +pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ; +pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ; +pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ; -pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) ) { return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ; } -pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) ) { return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) ) { return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) ) { return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; } -pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) ) { return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ; } +pascal OSErr AEHandleGURL( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) +{ + return wxTheApp->MacHandleAEGURL((WXEVENTREF *)event , reply) ; +} + + // AEODoc Calls MacOpenFile on each of the files passed short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) @@ -188,6 +180,31 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) return noErr; } +// AEODoc Calls MacOpenURL on the url passed + +short wxApp::MacHandleAEGURL(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) +{ + DescType returnedType; + Size actualSize; + char url[255]; + OSErr err = AEGetParamPtr((AppleEvent *)event, keyDirectObject, typeChar, + &returnedType, url, sizeof(url)-1, + &actualSize); + if (err != noErr) + return err; + + url[actualSize] = '\0'; // Terminate the C string + + ProcessSerialNumber PSN ; + PSN.highLongOfPSN = 0 ; + PSN.lowLongOfPSN = kCurrentProcess ; + SetFrontProcess( &PSN ) ; + + MacOpenURL(wxString(url, wxConvUTF8)); + + return noErr; +} + // AEPDoc Calls MacPrintFile on each of the files passed short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)) @@ -278,6 +295,9 @@ void wxApp::MacOpenFile(const wxString & fileName ) #endif } +void wxApp::MacOpenURL(const wxString & url ) +{ +} void wxApp::MacPrintFile(const wxString & fileName ) { @@ -369,7 +389,7 @@ struct IdPair int wxId ; } ; -IdPair gCommandIds [] = +IdPair gCommandIds [] = { { kHICommandCut , wxID_CUT } , { kHICommandCopy , wxID_COPY } , @@ -380,10 +400,10 @@ IdPair gCommandIds [] = { kHICommandRedo , wxID_REDO } , } ; -int wxMacCommandToId( UInt32 macCommandId ) +int wxMacCommandToId( UInt32 macCommandId ) { int wxid = 0 ; - + switch ( macCommandId ) { case kHICommandPreferences : @@ -418,10 +438,10 @@ int wxMacCommandToId( UInt32 macCommandId ) return wxid ; } -UInt32 wxIdToMacCommand( int wxId ) +UInt32 wxIdToMacCommand( int wxId ) { UInt32 macId = 0 ; - + if ( wxId == wxApp::s_macPreferencesMenuItemId ) macId = kHICommandPreferences ; else if (wxId == wxApp::s_macExitMenuItemId) @@ -446,7 +466,7 @@ UInt32 wxIdToMacCommand( int wxId ) return macId ; } -wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) +wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) { wxMenu* itemMenu = NULL ; int id = 0 ; @@ -465,16 +485,17 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) id = wxMacCommandToId( command.commandID ) ; // make sure it is one of our own menus, or of the 'synthetic' apple and help menus , otherwise don't touch MenuItemIndex firstUserHelpMenuItem ; - static MenuHandle mh = NULL ; - if ( mh == NULL ) + static MenuHandle helpMenuHandle = NULL ; + if ( helpMenuHandle == NULL ) { - if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr ) - mh = NULL ; + if ( UMAGetHelpMenuDontCreate( &helpMenuHandle , &firstUserHelpMenuItem) != noErr ) + helpMenuHandle = NULL ; } // is it part of the application or the Help menu, then look for the id directly if ( ( GetMenuHandle( kwxMacAppleMenuId ) != NULL && command.menu.menuRef == GetMenuHandle( kwxMacAppleMenuId ) ) || - ( mh != NULL && command.menu.menuRef == mh ) ) + ( helpMenuHandle != NULL && command.menu.menuRef == helpMenuHandle ) || + wxMenuBar::MacGetWindowMenuHMenu() != NULL && command.menu.menuRef == wxMenuBar::MacGetWindowMenuHMenu() ) { wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; if ( mbar ) @@ -482,7 +503,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) } else { - UInt32 refCon ; + URefCon refCon ; GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ; itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ; @@ -591,7 +612,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler if ( item ) { wxASSERT( itemMenu != NULL ) ; - + switch ( cEvent.GetKind() ) { case kEventProcessCommand : @@ -608,16 +629,16 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler { wxUpdateUIEvent event(id); event.SetEventObject( itemMenu ); - + bool processed = false; - + // Try the menu's event handler { wxEvtHandler *handler = itemMenu->GetEventHandler(); if ( handler ) processed = handler->ProcessEvent(event); } - + // Try the window the menu was popped up from // (and up through the hierarchy) if ( !processed ) @@ -631,11 +652,11 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler processed = win->GetEventHandler()->ProcessEvent(event); break; } - + menu = menu->GetParent(); } } - + if ( processed ) { // if anything changed, update the changed attribute @@ -737,11 +758,6 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler ) -#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__) -// we know it's there ;-) -WXIMPORT char std::__throws_bad_alloc ; -#endif - #ifdef __WXDEBUG__ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options, @@ -823,8 +839,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #endif - s_macCursorRgn = ::NewRgn() ; - // 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 @@ -871,6 +885,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) event_posted_context.perform = macPostedEventCallback; m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context); CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes); + // run loop takes ownership + CFRelease(m_macEventPosted); #endif UMAShowArrowCursor() ; @@ -879,6 +895,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } AEEventHandlerUPP sODocHandler = NULL ; +AEEventHandlerUPP sGURLHandler = NULL ; AEEventHandlerUPP sOAppHandler = NULL ; AEEventHandlerUPP sPDocHandler = NULL ; AEEventHandlerUPP sRAppHandler = NULL ; @@ -901,6 +918,7 @@ bool wxApp::OnInitGui() if (!sm_isEmbedded) { sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ; + sGURLHandler = NewAEEventHandlerUPP(AEHandleGURL) ; sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ; sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ; sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ; @@ -908,6 +926,8 @@ bool wxApp::OnInitGui() AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , sODocHandler , 0 , FALSE ) ; + AEInstallEventHandler( kInternetEventClass, kAEGetURL, + sGURLHandler , 0 , FALSE ) ; AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , sOAppHandler , 0 , FALSE ) ; AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , @@ -929,8 +949,10 @@ void wxApp::CleanUp() #ifdef __WXMAC_OSX__ if (m_macEventPosted) - CFRelease(m_macEventPosted); - m_macEventPosted = NULL; + { + CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes); + m_macEventPosted = NULL; + } #endif // One last chance for pending objects to be cleaned up @@ -946,8 +968,6 @@ void wxApp::CleanUp() #endif UMACleanupToolbox() ; - if (s_macCursorRgn) - ::DisposeRgn((RgnHandle)s_macCursorRgn); if (!sm_isEmbedded) RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) ); @@ -956,6 +976,8 @@ void wxApp::CleanUp() { AERemoveEventHandler( kCoreEventClass , kAEOpenDocuments , sODocHandler , FALSE ) ; + AERemoveEventHandler( kInternetEventClass, kAEGetURL, + sGURLHandler , FALSE ) ; AERemoveEventHandler( kCoreEventClass , kAEOpenApplication , sOAppHandler , FALSE ) ; AERemoveEventHandler( kCoreEventClass , kAEPrintDocuments , @@ -966,6 +988,7 @@ void wxApp::CleanUp() sQuitHandler , FALSE ) ; DisposeAEEventHandlerUPP( sODocHandler ) ; + DisposeAEEventHandlerUPP( sGURLHandler ) ; DisposeAEEventHandlerUPP( sOAppHandler ) ; DisposeAEEventHandlerUPP( sPDocHandler ) ; DisposeAEEventHandlerUPP( sRAppHandler ) ; @@ -1044,8 +1067,9 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) UInt32 keyCode ; unsigned char charCode ; UInt32 modifiers ; +#ifndef __LP64__ GetMouse( &rec->where) ; - +#endif err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode); err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode); @@ -1070,8 +1094,10 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { UInt32 keyCode, modifiers; unsigned char charCode ; +#ifndef __LP64__ GetMouse( &rec->where) ; +#endif rec->what = keyDown ; err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode); @@ -1108,50 +1134,6 @@ wxApp::wxApp() #endif } -int wxApp::MainLoop() -{ - m_keepGoing = true; - -#if wxMAC_USE_RAEL - RunApplicationEventLoop() ; -#else - while (m_keepGoing) - { - MacDoOneEvent() ; - } -#endif - - return 0; -} - -void wxApp::ExitMainLoop() -{ - m_keepGoing = false; - -#if wxMAC_USE_RAEL - QuitApplicationEventLoop() ; -#endif -} - -// Is a message/event pending? -bool wxApp::Pending() -{ - // without the receive event (with pull param = false ) nothing is ever reported - EventRef theEvent; - - ReceiveNextEvent(0, NULL, kEventDurationNoWait, false, &theEvent); - - return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ; -} - -// Dispatch a message. -bool wxApp::Dispatch() -{ - MacDoOneEvent() ; - - return true; -} - void wxApp::OnIdle(wxIdleEvent& event) { wxAppBase::OnIdle(event); @@ -1177,12 +1159,6 @@ void wxApp::WakeUpIdle() wxMacWakeUp() ; } -void wxApp::Exit() -{ - wxApp::CleanUp(); - ::ExitToShell() ; -} - void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { if (GetTopWindow()) @@ -1220,6 +1196,15 @@ bool wxApp::Yield(bool onlyIfNeeded) return false; } +#if wxUSE_THREADS + // Yielding from a non-gui thread needs to bail out, otherwise we end up + // possibly sending events in the thread too. + if ( !wxThread::IsMain() ) + { + return true; + } +#endif // wxUSE_THREADS + s_inYield = true; // by definition yield should handle all non-processed events @@ -1267,14 +1252,14 @@ void wxApp::MacDoOneEvent() switch (status) { - case eventLoopTimedOutErr : + case eventLoopTimedOutErr : if ( wxTheApp->ProcessIdle() ) sleepTime = kEventDurationNoWait ; else sleepTime = kEventDurationSecond; break; - case eventLoopQuitErr : + case eventLoopQuitErr : // according to QA1061 this may also occur // when a WakeUp Process is executed break; @@ -1297,6 +1282,14 @@ void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr ) // Override to process unhandled events as you please } +CFMutableArrayRef GetAutoReleaseArray() +{ + static CFMutableArrayRef array = 0; + if ( array == 0) + array= CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks); + return array; +} + void wxApp::MacHandleOneEvent( WXEVENTREF evr ) { EventTargetRef theTarget; @@ -1312,9 +1305,15 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS + + CFArrayRemoveAllValues( GetAutoReleaseArray() ); +} + +void wxApp::MacAddToAutorelease( void* cfrefobj ) +{ + CFArrayAppendValue( GetAutoReleaseArray(), cfrefobj ); } -long wxMacTranslateKey(unsigned char key, unsigned char code) ; long wxMacTranslateKey(unsigned char key, unsigned char code) { long retval = key ; @@ -1499,94 +1498,45 @@ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below #endif -bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) +wxMouseState wxGetMouseState() { - 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 - // and look at the character after - UInt32 state = 0; - UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state); - keychar = short(keyInfo & charCodeMask); - } - - long keyval = wxMacTranslateKey(keychar, keycode) ; - long realkeyval = keyval ; - if ( keyval == keychar ) - { - // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first) - realkeyval = short(keymessage & charCodeMask) ; - keyval = wxToupper( keyval ) ; - } - - // Check for NUMPAD keys - if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92) - { - keyval = keyval - '0' + WXK_NUMPAD0; - } - else if (keycode >= 67 && keycode <= 81) - { - switch (keycode) - { - case 76 : - keyval = WXK_NUMPAD_ENTER; - break; + wxMouseState ms; - case 81: - keyval = WXK_NUMPAD_EQUAL; - break; + wxPoint pt = wxGetMousePosition(); + ms.SetX(pt.x); + ms.SetY(pt.y); - case 67: - keyval = WXK_NUMPAD_MULTIPLY; - break; - - case 75: - keyval = WXK_NUMPAD_DIVIDE; - break; - - case 78: - keyval = WXK_NUMPAD_SUBTRACT; - break; +#if TARGET_API_MAC_OSX + UInt32 buttons = GetCurrentButtonState(); + ms.SetLeftDown( (buttons & 0x01) != 0 ); + ms.SetMiddleDown( (buttons & 0x04) != 0 ); + ms.SetRightDown( (buttons & 0x02) != 0 ); +#else + ms.SetLeftDown( Button() ); + ms.SetMiddleDown( 0 ); + ms.SetRightDown( 0 ); +#endif - case 69: - keyval = WXK_NUMPAD_ADD; - break; + UInt32 modifiers = GetCurrentKeyModifiers(); + ms.SetControlDown(modifiers & controlKey); + ms.SetShiftDown(modifiers & shiftKey); + ms.SetAltDown(modifiers & optionKey); + ms.SetMetaDown(modifiers & cmdKey); - case 65: - keyval = WXK_NUMPAD_DECIMAL; - break; + return ms; +} - default: - break; - } // end switch - } +// TODO : once the new key/char handling is tested, move all the code to wxWindow - wxKeyEvent event(wxEVT_KEY_DOWN); - bool handled = false ; - event.m_shiftDown = modifiers & shiftKey; - event.m_controlDown = modifiers & controlKey; - event.m_altDown = modifiers & optionKey; - event.m_metaDown = modifiers & cmdKey; - event.m_keyCode = keyval ; +bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) +{ + if ( !focus ) + return false ; -#if wxUSE_UNICODE - event.m_uniChar = uniChar ; -#endif + bool handled; + wxKeyEvent event(wxEVT_KEY_DOWN) ; + MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; - event.m_rawCode = keymessage; - event.m_rawFlags = modifiers; - event.m_x = wherex; - event.m_y = wherey; - event.SetTimestamp(when); - event.SetEventObject(focus); handled = focus->GetEventHandler()->ProcessEvent( event ) ; if ( handled && event.GetSkipped() ) handled = false ; @@ -1600,8 +1550,18 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi int command = ancestor->GetAcceleratorTable()->GetCommand( event ); if (command != -1) { + wxEvtHandler * const handler = ancestor->GetEventHandler(); + wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); - handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); + handled = handler->ProcessEvent( command_event ); + + if ( !handled ) + { + // accelerators can also be used with buttons, try them too + command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED); + handled = handler->ProcessEvent( command_event ); + } + break; } @@ -1613,34 +1573,48 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi } #endif // wxUSE_ACCEL - if (!handled) - { - wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ; + return handled ; +} - if (tlw) - { - event.Skip( false ) ; - event.SetEventType( wxEVT_CHAR_HOOK ); - // raw value again - event.m_keyCode = realkeyval ; - - handled = tlw->GetEventHandler()->ProcessEvent( event ); - if ( handled && event.GetSkipped() ) - handled = false ; - } +bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) +{ + if ( !focus ) + return false ; + + bool handled; + wxKeyEvent event( wxEVT_KEY_UP ) ; + MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; + handled = focus->GetEventHandler()->ProcessEvent( event ) ; + + return handled ; +} + +bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) +{ + if ( !focus ) + return false ; + + wxKeyEvent event(wxEVT_CHAR) ; + MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; + long keyval = event.m_keyCode ; + + bool handled = false ; + + wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ; + + if (tlw) + { + event.SetEventType( wxEVT_CHAR_HOOK ); + handled = tlw->GetEventHandler()->ProcessEvent( event ); + if ( handled && event.GetSkipped() ) + handled = false ; } if ( !handled ) { + event.SetEventType( wxEVT_CHAR ); event.Skip( false ) ; - event.SetEventType( wxEVT_CHAR ) ; - - // raw value again - event.m_keyCode = realkeyval ; - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - if ( handled && event.GetSkipped() ) - handled = false ; } if ( !handled && (keyval == WXK_TAB) ) @@ -1673,16 +1647,20 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ; if ( focus ) { - if ( keyval == WXK_RETURN ) + if ( keyval == WXK_RETURN || keyval == WXK_NUMPAD_ENTER ) { - wxButton *def = wxDynamicCast(focus->GetDefaultItem(), wxButton); - if ( def && def->IsEnabled() ) + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(focus), wxTopLevelWindow); + if ( tlw && tlw->GetDefaultItem() ) { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); - event.SetEventObject(def); - def->Command(event); + wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton); + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); - return true ; + return true ; + } } } else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) ) @@ -1694,20 +1672,17 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi } } } - return handled ; } -bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) +// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events. +void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) { - if ( !focus ) - return false ; - short keycode, keychar ; keychar = short(keymessage & charCodeMask); keycode = short(keymessage & keyCodeMask) >> 8 ; - if ( modifiers & (controlKey | shiftKey | optionKey) ) + if ( !(event.GetEventType() == wxEVT_CHAR) && (modifiers & (controlKey | shiftKey | optionKey) ) ) { // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier // and look at the character after @@ -1717,7 +1692,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier } long keyval = wxMacTranslateKey(keychar, keycode) ; - if ( keyval == keychar ) + if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) ) keyval = wxToupper( keyval ) ; // Check for NUMPAD keys @@ -1762,9 +1737,6 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier } // end switch } - bool handled = false ; - - wxKeyEvent event(wxEVT_KEY_UP); event.m_shiftDown = modifiers & shiftKey; event.m_controlDown = modifiers & controlKey; event.m_altDown = modifiers & optionKey; @@ -1780,7 +1752,4 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier event.m_y = wherey; event.SetTimestamp(when); event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - - return handled ; }