X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04bf2fb51514e3ec8631a1d8ea1f610fca851005..aac75444c6e2c1e4b4304debbdf0d600156ca74a:/src/mac/carbon/app.cpp diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 3e1b8065fc..e997cc3e1b 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,11 +68,8 @@ # include #endif -extern wxList wxPendingDelete; - -#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; @@ -84,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 ; @@ -106,33 +102,33 @@ 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) ; } @@ -359,7 +355,7 @@ struct IdPair int wxId ; } ; -IdPair gCommandIds [] = +IdPair gCommandIds [] = { { kHICommandCut , wxID_CUT } , { kHICommandCopy , wxID_COPY } , @@ -370,10 +366,10 @@ IdPair gCommandIds [] = { kHICommandRedo , wxID_REDO } , } ; -int wxMacCommandToId( UInt32 macCommandId ) +int wxMacCommandToId( UInt32 macCommandId ) { int wxid = 0 ; - + switch ( macCommandId ) { case kHICommandPreferences : @@ -408,10 +404,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) @@ -436,7 +432,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 ; @@ -472,7 +468,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 ) ; @@ -581,7 +577,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler if ( item ) { wxASSERT( itemMenu != NULL ) ; - + switch ( cEvent.GetKind() ) { case kEventProcessCommand : @@ -598,16 +594,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 ) @@ -621,11 +617,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 @@ -727,11 +723,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, @@ -813,8 +804,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 @@ -861,6 +850,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() ; @@ -919,8 +910,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 @@ -936,8 +929,6 @@ void wxApp::CleanUp() #endif UMACleanupToolbox() ; - if (s_macCursorRgn) - ::DisposeRgn((RgnHandle)s_macCursorRgn); if (!sm_isEmbedded) RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) ); @@ -1034,8 +1025,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); @@ -1060,8 +1052,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); @@ -1254,7 +1248,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) #endif // wxUSE_THREADS } -long wxMacTranslateKey(unsigned char key, unsigned char code) ; long wxMacTranslateKey(unsigned char key, unsigned char code) { long retval = key ; @@ -1447,11 +1440,17 @@ wxMouseState wxGetMouseState() ms.SetX(pt.x); ms.SetY(pt.y); +#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 + UInt32 modifiers = GetCurrentKeyModifiers(); ms.SetControlDown(modifiers & controlKey); ms.SetShiftDown(modifiers & shiftKey); @@ -1468,10 +1467,10 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi if ( !focus ) return false ; - bool handled; + bool handled; wxKeyEvent event(wxEVT_KEY_DOWN) ; MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; - + handled = focus->GetEventHandler()->ProcessEvent( event ) ; if ( handled && event.GetSkipped() ) handled = false ; @@ -1510,7 +1509,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier wxKeyEvent event( wxEVT_KEY_UP ) ; MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ; - + return handled ; } @@ -1518,7 +1517,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers { if ( !focus ) return false ; - + wxKeyEvent event(wxEVT_CHAR) ; MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; long keyval = event.m_keyCode ; @@ -1526,7 +1525,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers bool handled = false ; wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ; - + if (tlw) { event.SetEventType( wxEVT_CHAR_HOOK ); @@ -1541,7 +1540,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers event.Skip( false ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ; } - + if ( !handled && (keyval == WXK_TAB) ) { wxWindow* iter = focus->GetParent() ; @@ -1574,14 +1573,18 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers { if ( keyval == WXK_RETURN ) { - 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 ) ) @@ -1596,7 +1599,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers return handled ; } -// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events. +// 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 ) { short keycode, keychar ; @@ -1665,8 +1668,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess event.m_keyCode = keyval ; #if wxUSE_UNICODE event.m_uniChar = uniChar ; - if ( event.GetEventType() == wxEVT_CHAR ) - event.m_keyCode = uniChar ; #endif event.m_rawCode = keymessage;