X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..da0766ab2ae2357cd4dc111415731ee85aa45984:/src/mac/carbon/app.cpp diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index b16dcd492a..ad2eb4d5ea 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: app.cpp // Purpose: wxApp -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,6 +13,8 @@ #pragma implementation "app.h" #endif +#include "wx/defs.h" + #include "wx/window.h" #include "wx/frame.h" #include "wx/button.h" @@ -34,9 +36,7 @@ #include "wx/tooltip.h" #include "wx/textctrl.h" #include "wx/menu.h" -#if wxUSE_WX_RESOURCES -#include "wx/resource.h" -#endif +#include "wx/docview.h" #include @@ -53,28 +53,43 @@ #include "wx/mac/uma.h" #include "wx/mac/macnotfy.h" -#if wxUSE_SOCKETS - #ifdef __DARWIN__ - #include - #else - #include - #include - #endif +#ifdef __DARWIN__ +# include +# if defined(WXMAKINGDLL) +# include +# endif +#else +# include +# include +# include +# include +# include #endif -extern char *wxBuffer; extern wxList wxPendingDelete; extern wxList *wxWinMacWindowList; extern wxList *wxWinMacControlList; +// statics for implementation + +static bool s_inYield = FALSE; +static bool s_inOnIdle = FALSE; + +#if TARGET_CARBON +static bool s_inReceiveEvent = FALSE ; +static EventTime sleepTime = kEventDurationNoWait ; +#else +static long sleepTime = 0 ; +#endif + wxApp *wxTheApp = NULL; #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) - EVT_END_SESSION(wxApp::OnEndSession) - EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) + EVT_END_SESSION(wxApp::OnEndSession) + EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() #endif @@ -85,327 +100,375 @@ const short kMacMinHeap = (29 * 1024) ; const short kwxMacMenuBarResource = 1 ; const short kwxMacAppleMenuId = 1 ; -WXHRGN wxApp::s_macCursorRgn = NULL; -wxWindow* wxApp::s_captureWindow = NULL ; -int wxApp::s_lastMouseDown = 0 ; -long wxApp::sm_lastMessageTime = 0; +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_macDefaultEncodingIsPC = true ; -bool wxApp::s_macSupportPCMenuShortcuts = true ; -long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; -wxString wxApp::s_macHelpMenuTitleName = "&Help" ; + +bool wxApp::s_macDefaultEncodingIsPC = true ; +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 = wxT("&Help") ; + +//---------------------------------------------------------------------- +// 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 AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ; } -pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ; } -pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) +pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) ) { - wxApp* app = (wxApp*) refcon ; return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; } -short wxApp::MacHandleAEODoc(const WXEVENTREF event , WXEVENTREF reply) +// AEODoc Calls MacOpenFile on each of the files passed + +short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply)) { - SysBeep(40) ; + AEDescList docList; + AEKeyword keywd; + DescType returnedType; + Size actualSize; + long itemsInList; + FSSpec theSpec; + OSErr err; + short i; + 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 ) ; - return noErr ; + + for (i = 1; i <= itemsInList; i++) { + AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType, + (Ptr) & theSpec, sizeof(theSpec), &actualSize); + wxString fName = wxMacFSSpec2MacFilename(&theSpec); + MacOpenFile(fName); + } + return noErr; } -short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF reply) +// AEPDoc Calls MacPrintFile on each of the files passed + +short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)) { - return noErr ; + AEDescList docList; + AEKeyword keywd; + DescType returnedType; + Size actualSize; + long itemsInList; + FSSpec theSpec; + OSErr err; + short i; + 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); + wxString fName = wxMacFSSpec2MacFilename(&theSpec); + MacPrintFile(fName); + } + return noErr; } -short wxApp::MacHandleAEOApp(const WXEVENTREF event , WXEVENTREF reply) +// AEOApp calls MacNewFile + +short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { + MacNewFile() ; return noErr ; } -short wxApp::MacHandleAEQuit(const WXEVENTREF event , WXEVENTREF reply) +// AEQuit attempts to quit the application + +short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { - wxWindow* win = GetTopWindow() ; + /* wxWindow* win = GetTopWindow() ; if ( win ) { win->Close(TRUE ) ; } else + */ { ExitMainLoop() ; } return noErr ; } -char StringMac[] = "\x0d\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" - "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f" - "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf" - "\xb1\xb4\xb5\xb6\xbb\xbc\xbe\xbf" - "\xc0\xc1\xc2\xc4\xc7\xc8\xc9\xcb\xcc\xcd\xce\xcf" - "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xca\xdb" ; - -char StringANSI[] = "\x0a\xC4\xC5\xC7\xC9\xD1\xD6\xDC\xE1\xE0\xE2\xE4\xE3\xE5\xE7\xE9\xE8" - "\xEA\xEB\xED\xEC\xEE\xEF\xF1\xF3\xF2\xF4\xF6\xF5\xFA\xF9\xFB\xFC" - "\x86\xBA\xA2\xA3\xA7\x95\xB6\xDF\xAE\xA9\x99\xB4\xA8\xC6\xD8" - "\xB1\xA5\xB5\xF0\xAA\xBA\xE6\xF8" - "\xBF\xA1\xAC\x83\xAB\xBB\x85\xC0\xC3\xD5\x8C\x9C" - "\x96\x97\x93\x94\x91\x92\xF7\xFF\xA0\x80" ; +//---------------------------------------------------------------------- +// Support Routines linking the Mac...File Calls to the Document Manager +//---------------------------------------------------------------------- -void wxMacConvertFromPC( const char *from , char *to , int len ) +void wxApp::MacOpenFile(const wxString & fileName ) { - char *c ; - if ( from == to ) - { - for( int i = 0 ; i < len ; ++ i ) - { - c = strchr( StringANSI , *from ) ; - if ( c != NULL ) - { - *to = StringMac[ c - StringANSI] ; - } - ++to ; - ++from ; - } - } - else - { - for( int i = 0 ; i < len ; ++ i ) - { - c = strchr( StringANSI , *from ) ; - if ( c != NULL ) - { - *to = StringMac[ c - StringANSI] ; - } - else - { - *to = *from ; - } - ++to ; - ++from ; - } - } + wxDocManager* dm = wxDocManager::GetDocumentManager() ; + if ( dm ) + dm->CreateDocument(fileName , wxDOC_SILENT ) ; } -void wxMacConvertToPC( const char *from , char *to , int len ) +void wxApp::MacPrintFile(const wxString & fileName ) { - char *c ; - if ( from == to ) + wxDocManager* dm = wxDocManager::GetDocumentManager() ; + if ( dm ) { - for( int i = 0 ; i < len ; ++ i ) + wxDocument *doc = dm->CreateDocument(fileName , wxDOC_SILENT ) ; + if ( doc ) { - c = strchr( StringMac , *from ) ; - if ( c != NULL ) + wxView* view = doc->GetFirstView() ; + if( view ) { - *to = StringANSI[ c - StringMac] ; - } - ++to ; - ++from ; - } - } - else - { - for( int i = 0 ; i < len ; ++ i ) - { - c = strchr( StringMac , *from ) ; - if ( c != NULL ) - { - *to = StringANSI[ c - StringMac] ; + wxPrintout *printout = view->OnCreatePrintout(); + if (printout) + { + wxPrinter printer; + printer.Print(view->GetFrame(), printout, TRUE); + delete printout; + } } - else + if (doc->Close()) { - *to = *from ; + doc->DeleteAllViews(); + dm->RemoveDocument(doc) ; } - ++to ; - ++from ; } } } -void wxMacConvertFromPC( char * p ) +void wxApp::MacNewFile() { - char *ptr = p ; - int len = strlen ( p ) ; - - wxMacConvertFromPC( ptr , ptr , len ) ; } -void wxMacConvertFromPCForControls( char * p ) -{ - char *ptr = p ; - int len = strlen ( p ) ; +//---------------------------------------------------------------------- +// Carbon Event Handler +//---------------------------------------------------------------------- - wxMacConvertFromPC( ptr , ptr , len ) ; - for ( int i = 0 ; i < strlen ( ptr ) ; i++ ) +#if TARGET_CARBON + + static const EventTypeSpec eventList[] = { - if ( ptr[i] == '&' && ptr[i]+1 != ' ' ) - { - memmove( &ptr[i] , &ptr[i+1] , strlen( &ptr[i+1] ) + 1) ; - } - } -} + { kEventClassCommand, kEventProcessCommand } , + { kEventClassCommand, kEventCommandUpdateStatus } , -void wxMacConvertFromPC( unsigned char *p ) -{ - char *ptr = (char*) p + 1 ; - int len = p[0] ; + { kEventClassApplication , kEventAppActivated } , + { kEventClassApplication , kEventAppDeactivated } , + // handling the quit event is not recommended by apple + // rather using the quit apple event - which we do + + { kEventClassAppleEvent , kEventAppleEvent } , - wxMacConvertFromPC( ptr , ptr , len ) ; + { kEventClassMouse , kEventMouseDown } , + { 'WXMC' , 'WXMC' } + } ; + +static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + return eventNotHandledErr ; } -extern char *wxBuffer ; +// 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 -wxString wxMacMakeMacStringFromPC( const char * p ) +static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - const char *ptr = p ; - int len = strlen ( p ) ; - char *buf = wxBuffer ; + OSStatus result = eventNotHandledErr ; - if ( len >= BUFSIZ + 512 ) + switch( GetEventKind(event) ) { - buf = new char [len+1] ; + case kEventMouseDown : + { + Point point ; + WindowRef window ; + + GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, + sizeof( Point ), NULL, &point ); + short windowPart = ::FindWindow(point, &window); + + if ( windowPart == inMenuBar ) + { + MenuSelect( point ) ; + result = noErr ; + } + } + break ; } - wxMacConvertFromPC( ptr , buf , len ) ; - buf[len] = 0 ; - wxString result( buf ) ; - if ( buf != wxBuffer ) - delete buf ; return result ; } - -void wxMacConvertToPC( char * p ) +static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - char *ptr = p ; - int len = strlen ( p ) ; + OSStatus result = eventNotHandledErr ; - wxMacConvertToPC( ptr , ptr , len ) ; -} + HICommand command ; -void wxMacConvertToPC( unsigned char *p ) -{ - char *ptr = (char*) p + 1 ; - int len = p[0] ; + GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL, + sizeof( HICommand ), NULL, &command ); - wxMacConvertToPC( ptr , ptr , len ) ; -} + MenuCommand id = command.commandID ; + if ( id == kHICommandPreferences ) + id = wxApp::s_macPreferencesMenuItemId ; -wxString wxMacMakePCStringFromMac( const char * p ) -{ - const char *ptr = p ; - int len = strlen ( p ) ; - char *buf = wxBuffer ; + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + wxMenu* menu = NULL ; + wxMenuItem* item = NULL ; - if ( len >= BUFSIZ + 512 ) - { - buf = new char [len+1] ; - } + if ( mbar ) + item = mbar->FindItem( id , &menu ) ; - wxMacConvertToPC( ptr , buf , len ) ; - buf[len] = 0 ; + if ( item == NULL || menu == NULL || mbar == NULL ) + return result ; + + switch( GetEventKind( event ) ) + { + case kEventProcessCommand : + { + if (item->IsCheckable()) + { + item->Check( !item->IsChecked() ) ; + } + + menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; + result = noErr ; + } + break ; + case kEventCommandUpdateStatus: + // eventually trigger an updateui round + result = noErr ; + break ; + default : + break ; + } - wxString result( buf ) ; - if ( buf != wxBuffer ) - delete buf ; return result ; } -wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) +static pascal OSStatus ApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - if (mac2pcEncoding) + OSStatus result = eventNotHandledErr ; + switch ( GetEventKind( event ) ) { - return wxMacMakePCStringFromMac( from ) ; - } - else - { - return wxString( from ) ; + case kEventAppActivated : + { + if ( wxTheApp ) + wxTheApp->MacResume( true ) ; + result = noErr ; + } + break ; + case kEventAppDeactivated : + { + if ( wxTheApp ) + wxTheApp->MacSuspend( true ) ; + result = noErr ; + } + break ; + default : + break ; } + return result ; } -wxString wxMacMakeStringFromPascal( StringPtr from , bool mac2pcEncoding ) +pascal OSStatus wxAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - // this is safe since a pascal string can never be larger than 256 bytes - char s[256] ; - CopyPascalStringToC( from , s ) ; - if (mac2pcEncoding) + OSStatus result = eventNotHandledErr ; + switch( GetEventClass( event ) ) { - return wxMacMakePCStringFromMac( s ) ; - } - else - { - return wxString( s ) ; + case kEventClassCommand : + result = CommandEventHandler( handler , event , data ) ; + break ; + case kEventClassApplication : + result = ApplicationEventHandler( handler , event , data ) ; + break ; + case kEventClassMenu : + result = MenuEventHandler( handler , event , data ) ; + break ; + case kEventClassMouse : + result = MouseEventHandler( handler , event , data ) ; + break ; + case kEventClassAppleEvent : + { + EventRecord rec ; + wxMacConvertEventToRecord( event , &rec ) ; + result = AEProcessAppleEvent( &rec ) ; + } + break ; + default : + break ; } -} -void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) -{ - if (pc2macEncoding) - { - CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ; - } - else - { - CopyCStringToPascal( from , to ) ; - } + return result ; } +DEFINE_ONE_SHOT_HANDLER_GETTER( wxAppEventHandler ) + +#endif + +#if defined(WXMAKINGDLL) && !defined(__DARWIN__) +// we know it's there ;-) +WXIMPORT char std::__throws_bad_alloc ; +#endif + bool wxApp::Initialize() { - int error = 0 ; + int error = 0 ; - // Mac-specific + // Mac-specific - UMAInitToolbox( 4 ) ; - SetEventMask( everyEvent ) ; + UMAInitToolbox( 4 ) ; + SetEventMask( everyEvent ) ; UMAShowWatchCursor() ; -#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) - AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerUPP(AEHandleODoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , NewAEEventHandlerUPP(AEHandlePDoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) , - (long) wxTheApp , FALSE ) ; -#else - AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerProc(AEHandleODoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerProc(AEHandleOApp) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , NewAEEventHandlerProc(AEHandlePDoc) , - (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerProc(AEHandleQuit) , - (long) wxTheApp , FALSE ) ; +#if defined(WXMAKINGDLL) && defined(__DARWIN__) + // open shared library resources from here since we don't have + // __wxinitialize in Mach-O shared libraries + wxStAppResource::OpenSharedLibraryResource(NULL); #endif - #ifndef __DARWIN__ - // test the minimal configuration necessary + // test the minimal configuration necessary - #if !TARGET_CARBON +# if !TARGET_CARBON long theSystem ; long theMachine; @@ -429,7 +492,7 @@ bool wxApp::Initialize() { error = kMacSTRSmallSize; } - #endif +# endif /* else { @@ -445,6 +508,7 @@ bool wxApp::Initialize() if ( error ) { + wxStAppResource resload ; short itemHit; Str255 message; @@ -456,26 +520,24 @@ bool wxApp::Initialize() } #ifndef __DARWIN__ - #if __option(profile) +# if __option(profile) ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ; - #endif +# endif #endif - // now avoid exceptions thrown for new (bad_alloc) - #ifndef __DARWIN__ - std::__throws_bad_alloc = FALSE ; + // now avoid exceptions thrown for new (bad_alloc) + // FIXME CS for some changes outside wxMac does not compile anymore +#if 0 + std::__throws_bad_alloc = 0 ; #endif - s_macCursorRgn = ::NewRgn() ; - -#ifdef __WXMSW__ - wxBuffer = new char[1500]; -#else - wxBuffer = new char[BUFSIZ + 512]; #endif + wxMacSetupConverters() ; - wxClassInfo::InitializeClasses(); + s_macCursorRgn = ::NewRgn() ; + + wxClassInfo::InitializeClasses(); #if wxUSE_RESOURCES // wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); @@ -484,48 +546,77 @@ bool wxApp::Initialize() #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(); + wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); + wxTheColourDatabase->Initialize(); - // 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(); + wxInitializeStockLists(); + wxInitializeStockObjects(); -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif + wxBitmap::InitStandardHandlers(); - wxBitmap::InitStandardHandlers(); + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) { + return FALSE; + } - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) { - return FALSE; - } + wxMacCreateNotifierTable() ; - wxWinMacWindowList = new wxList(wxKEY_INTEGER); - wxWinMacControlList = new wxList(wxKEY_INTEGER); + UMAShowArrowCursor() ; - wxMacCreateNotifierTable() ; + return TRUE; +} + +bool wxApp::OnInitGui() +{ + if( !wxAppBase::OnInitGui() ) + return false ; - UMAShowArrowCursor() ; +#if TARGET_CARBON + InstallStandardEventHandler( GetApplicationEventTarget() ) ; - return TRUE; + InstallApplicationEventHandler( + GetwxAppEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, wxTheApp, &((EventHandlerRef)wxTheApp->m_macEventHandler)); +#endif + +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) + AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , + NewAEEventHandlerUPP(AEHandleODoc) , + 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , + NewAEEventHandlerUPP(AEHandleOApp) , + 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , + NewAEEventHandlerUPP(AEHandlePDoc) , + 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , + NewAEEventHandlerUPP(AEHandleQuit) , + 0 , FALSE ) ; +#else + AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , + NewAEEventHandlerProc(AEHandleODoc) , + 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , + NewAEEventHandlerProc(AEHandleOApp) , + 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , + NewAEEventHandlerProc(AEHandlePDoc) , + 0 , FALSE ) ; + AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , + NewAEEventHandlerProc(AEHandleQuit) , + 0 , FALSE ) ; +#endif + + return TRUE ; } 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 @@ -540,47 +631,47 @@ void wxApp::CleanUp() // One last chance for pending objects to be cleaned up wxTheApp->DeletePendingObjects(); - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif + wxModule::CleanUpModules(); - wxDeleteStockObjects() ; + wxDeleteStockObjects() ; // Destroy all GDI lists, etc. wxDeleteStockLists(); - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; + delete wxTheColourDatabase; + wxTheColourDatabase = NULL; - wxBitmap::CleanUpHandlers(); - - delete[] wxBuffer; - wxBuffer = NULL; - - wxMacDestroyNotifierTable() ; - if (wxWinMacWindowList) - delete wxWinMacWindowList ; + wxBitmap::CleanUpHandlers(); + wxMacDestroyNotifierTable() ; + if (wxWinMacWindowList) { + delete wxWinMacWindowList ; + } + if (wxWinMacControlList) { + delete wxWinMacControlList ; + } delete wxPendingEvents; + wxPendingEvents = NULL; + #if wxUSE_THREADS delete wxPendingEventsLocker; + // There is still more cleanup code that will try to use this if not NULL. + wxPendingEventsLocker = NULL; // If we don't do the following, we get an apparent memory leak. ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); #endif - wxClassInfo::CleanUpClasses(); + wxClassInfo::CleanUpClasses(); #ifndef __DARWIN__ - #if __option(profile) - ProfilerDump( "\papp.prof" ) ; - ProfilerTerm() ; - #endif +# if __option(profile) + ProfilerDump( (StringPtr)"\papp.prof" ) ; + ProfilerTerm() ; +# endif #endif - delete wxTheApp; - wxTheApp = NULL; + 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 @@ -601,9 +692,17 @@ void wxApp::CleanUp() 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) + if (s_macCursorRgn) { ::DisposeRgn((RgnHandle)s_macCursorRgn); + } #if 0 TerminateAE() ; @@ -614,23 +713,196 @@ void wxApp::CleanUp() // wxEntry //---------------------------------------------------------------------- -int wxEntryStart( int argc, char *argv[] ) +// extern variable for shared library resource id +// need to be able to find it with NSLookupAndBindSymbol +short gSharedLibraryResource = kResFileNotOpened ; + +#if defined(WXMAKINGDLL) && defined(__DARWIN__) +CFBundleRef gSharedLibraryBundle = NULL; +#endif /* WXMAKINGDLL && __DARWIN__ */ + +wxStAppResource::wxStAppResource() { - return wxApp::Initialize(); + m_currentRefNum = CurResFile() ; + if ( gSharedLibraryResource != kResFileNotOpened ) + { + UseResFile( gSharedLibraryResource ) ; + } } +wxStAppResource::~wxStAppResource() +{ + if ( m_currentRefNum != kResFileNotOpened ) + { + UseResFile( m_currentRefNum ) ; + } +} -int wxEntryInitGui() +void wxStAppResource::OpenSharedLibraryResource(const void *initBlock) { - return wxTheApp->OnInitGui(); + gSharedLibraryResource = kResFileNotOpened; + +#ifdef WXMAKINGDLL + if ( initBlock != NULL ) { + const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock; + FSSpec *fileSpec = NULL; + + if (theInitBlock->fragLocator.where == kDataForkCFragLocator) { + fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec; + } + else if (theInitBlock->fragLocator.where == kResourceCFragLocator) { + fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec; + } + + if (fileSpec != NULL) { + gSharedLibraryResource = FSpOpenResFile(fileSpec, fsRdPerm); + } + } + else { +#ifdef __DARWIN__ + // Open the shared library resource file if it is not yet open + NSSymbol theSymbol; + NSModule theModule; + const char *theLibPath; + + gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows")); + if (gSharedLibraryBundle != NULL) { + // wxWindows has been bundled into a framework + // load the framework resources + + gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle); + } + else { + // wxWindows is a simple dynamic shared library + // load the resources from the data fork of a separate resource file + char *theResPath; + char *theName; + char *theExt; + FSRef theResRef; + OSErr theErr = noErr; + + // get the library path + theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource"); + 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); + if (theResPath != NULL) { + theName = strrchr(theResPath, '/'); + if (theName == NULL) { + // no directory elements in path + theName = theResPath; + } + // find ".dylib" shared library extension + theExt = strstr(theName, ".dylib"); + // 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) { + // try in current directory (using name only) + theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false); + } + + // open the resource file + if (theErr == noErr) { + theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm, + &gSharedLibraryResource); + } + if (theErr != noErr) { +#ifdef __WXDEBUG__ + fprintf(stderr, + wxT("unable to open wxMac resource file '%s'\n"), + theResPath ); +#endif // __WXDEBUG__ + } + + // free duplicated resource file path + free(theResPath); + } + } +#endif /* __DARWIN__ */ + } +#endif /* WXMAKINGDLL */ +} + +void wxStAppResource::CloseSharedLibraryResource() +{ +#ifdef WXMAKINGDLL + // Close the shared library resource file + if (gSharedLibraryResource != kResFileNotOpened) { +#ifdef __DARWIN__ + if (gSharedLibraryBundle != NULL) { + CFBundleCloseBundleResourceMap(gSharedLibraryBundle, + gSharedLibraryResource); + gSharedLibraryBundle = NULL; + } + else +#endif /* __DARWIN__ */ + { + CloseResFile(gSharedLibraryResource); + } + gSharedLibraryResource = kResFileNotOpened; + } +#endif /* WXMAKINGDLL */ } +#if defined(WXMAKINGDLL) && !defined(__DARWIN__) -void wxEntryCleanup() +// for shared libraries we have to manually get the correct resource +// ref num upon initializing and releasing when terminating, therefore +// the __wxinitialize and __wxterminate must be used + +extern "C" { + void __sinit(void); /* (generated by linker) */ + pascal OSErr __initialize(const CFragInitBlock *theInitBlock); + pascal void __terminate(void); +} + +pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock) { - wxApp::CleanUp(); + wxStAppResource::OpenSharedLibraryResource( theInitBlock ) ; + return __initialize( theInitBlock ) ; +} + +pascal void __wxterminate(void) +{ + wxStAppResource::CloseSharedLibraryResource() ; + __terminate() ; +} + +#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 ) { @@ -662,18 +934,39 @@ int wxEntry( int argc, char *argv[] , bool enterLoop ) wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); -#ifndef __DARWIN__ +#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; +#if wxUSE_UNICODE + wxTheApp->argv = new wxChar*[argc+1]; + int mb_argc ; + for ( mb_argc = 0; mb_argc < argc; mb_argc++ ) + { + wxTheApp->argv[mb_argc] = wxStrdup(wxConvLocal.cMB2WX(argv[mb_argc])); + } + wxTheApp->argv[mb_argc] = (wxChar *)NULL; +#else wxTheApp->argv = argv; +#endif // GUI-specific initialization, such as creating an app context. wxEntryInitGui(); - // Here frames insert themselves automatically // into wxTopLevelWindows by getting created // in OnInit(). @@ -709,12 +1002,124 @@ int wxEntry( int argc, char *argv[] , bool enterLoop ) } } - wxTheApp->OnExit(); + wxTheApp->OnExit(); + + wxEntryCleanup(); + + return retValue; +} + +#if TARGET_CARBON + +bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) +{ + bool converted = ConvertEventRefToEventRecord( event,rec) ; + OSStatus err = noErr ; + if ( !converted ) + { + switch( GetEventClass( event ) ) + { + case kEventClassKeyboard : + { + converted = true ; + switch( GetEventKind(event) ) + { + case kEventRawKeyDown : + rec->what = keyDown ; + break ; + case kEventRawKeyRepeat : + rec->what = autoKey ; + break ; + case kEventRawKeyUp : + rec->what = keyUp ; + break ; + case kEventRawKeyModifiersChanged : + rec->what = nullEvent ; + break ; + default : + converted = false ; + break ; + } + if ( converted ) + { + UInt32 keyCode ; + unsigned char charCode ; + UInt32 modifiers ; + GetMouse( &rec->where) ; + + 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); + rec->modifiers = modifiers ; + rec->message = (keyCode << 8 ) + charCode ; + } + } + break ; + case kEventClassTextInput : + { + switch( GetEventKind( event ) ) + { + case kEventTextInputUnicodeForKeyEvent : + { + EventRef rawEvent ; + err = GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ; + converted = true ; + { + UInt32 keyCode ; + unsigned char charCode ; + UInt32 modifiers ; + GetMouse( &rec->where) ; + rec->what = keyDown ; + err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers); + err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode); + err = GetEventParameter(rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode); + rec->modifiers = modifiers ; + rec->message = (keyCode << 8 ) + charCode ; + } + } + break ; + default : + break ; + } + } + break ; + } + } + + return converted ; +} - wxEntryCleanup(); +/* +pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; - return retValue; + EventRecord rec ; + switch ( GetEventClass( event ) ) + { + case kEventClassKeyboard : + if ( wxMacConvertEventToRecord( event , &rec ) ) + { + wxTheApp->MacHandleModifierEvents( &rec ) ; + wxTheApp->MacHandleOneEvent( &rec ) ; + result = noErr ; + } + break ; + case kEventClassTextInput : + if ( wxMacConvertEventToRecord( event , &rec ) ) + { + wxTheApp->MacHandleModifierEvents( &rec ) ; + wxTheApp->MacHandleOneEvent( &rec ) ; + result = noErr ; + } + break ; + default : + break ; + } + return result ; } +*/ +#endif // Static member initialization wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; @@ -724,13 +1129,14 @@ wxApp::wxApp() m_topWindow = NULL; wxTheApp = this; - m_wantDebugOutput = TRUE ; +#if WXWIN_COMPATIBILITY_2_2 + m_wantDebugOutput = TRUE; +#endif argc = 0; argv = NULL; m_printMode = wxPRINT_WINDOWS; - m_exitOnFrameDelete = TRUE; m_auto3D = TRUE; } @@ -744,14 +1150,14 @@ bool wxApp::Initialized() int wxApp::MainLoop() { - m_keepGoing = TRUE; + m_keepGoing = TRUE; - while (m_keepGoing) - { + while (m_keepGoing) + { MacDoOneEvent() ; - } + } - return 0; + return 0; } // Returns TRUE if more time is needed. @@ -766,15 +1172,19 @@ bool wxApp::ProcessIdle() void wxApp::ExitMainLoop() { - m_keepGoing = FALSE; + m_keepGoing = FALSE; } // Is a message/event pending? bool wxApp::Pending() { +#if TARGET_CARBON + return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ; +#else EventRecord event ; - return EventAvail( everyEvent , &event ) ; + return EventAvail( everyEvent , &event ) ; +#endif } // Dispatch a message. @@ -785,8 +1195,6 @@ void wxApp::Dispatch() void wxApp::OnIdle(wxIdleEvent& event) { - static bool s_inOnIdle = FALSE; - // Avoid recursion (via ProcessEvent default case) if ( s_inOnIdle ) return; @@ -814,6 +1222,8 @@ void wxApp::OnIdle(wxIdleEvent& event) wxMacProcessNotifierAndPendingEvents(); s_inOnIdle = FALSE; + if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar()) + wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar(); } void wxWakeUpIdle() @@ -825,14 +1235,14 @@ void wxWakeUpIdle() bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); + wxWindowListNode* node = wxTopLevelWindows.GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); + node = node->GetNext(); } return needMore; } @@ -849,24 +1259,24 @@ bool wxApp::SendIdleEvents(wxWindow* win) if (event.MoreRequested()) needMore = TRUE; - wxNode* node = win->GetChildren().First(); + wxWindowListNode* node = win->GetChildren().GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); + node = node->GetNext(); } return needMore ; } void wxApp::DeletePendingObjects() { - wxNode *node = wxPendingDelete.First(); + wxNode *node = wxPendingDelete.GetFirst(); while (node) { - wxObject *obj = (wxObject *)node->Data(); + wxObject *obj = (wxObject *)node->GetData(); delete obj; @@ -875,33 +1285,10 @@ void wxApp::DeletePendingObjects() // Deleting one object may have deleted other pending // objects, so start from beginning of list again. - node = wxPendingDelete.First(); + node = wxPendingDelete.GetFirst(); } } -wxIcon -wxApp::GetStdIcon(int which) const -{ - switch(which) - { - case wxICON_INFORMATION: - return wxIcon("wxICON_INFO"); - - case wxICON_QUESTION: - return wxIcon("wxICON_QUESTION"); - - case wxICON_EXCLAMATION: - return wxIcon("wxICON_WARNING"); - - default: - wxFAIL_MSG(wxT("requested non existent standard icon")); - // still fall through - - case wxICON_HAND: - return wxIcon("wxICON_ERROR"); - } -} - void wxExit() { wxLogError(_("Fatal error: exiting")); @@ -937,8 +1324,6 @@ void wxCYield() bool wxApp::Yield(bool onlyIfNeeded) { - static bool s_inYield = FALSE; - if (s_inYield) { if ( !onlyIfNeeded ) @@ -954,19 +1339,52 @@ bool wxApp::Yield(bool onlyIfNeeded) #if wxUSE_THREADS YieldToAnyThread() ; #endif + // by definition yield should handle all non-processed events +#if TARGET_CARBON + EventRef theEvent; + + OSStatus status = noErr ; + do + { + 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 + sleepTime = kEventDurationNoWait ; + } + else if ( status == eventLoopQuitErr ) + { + // according to QA1061 this may also occur when a WakeUp Process + // is executed + } + else + { + MacHandleOneEvent( theEvent ) ; + ReleaseEvent(theEvent); + } + } while( status == noErr ) ; +#else EventRecord event ; - long sleepTime = 1 ; //::GetCaretTime(); + // 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 ; - while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn)) + while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn)) { - wxTheApp->MacHandleOneEvent( &event ); + MacHandleModifierEvents( &event ) ; + MacHandleOneEvent( &event ); if ( event.what != kHighLevelEvent ) SetRectRgn( (RgnHandle) wxApp::s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ; } + MacHandleModifierEvents( &event ) ; +#endif wxMacProcessNotifierAndPendingEvents() ; - s_inYield = FALSE; return TRUE; @@ -976,35 +1394,56 @@ bool wxApp::Yield(bool onlyIfNeeded) void wxApp::MacSuspend( bool convertClipboard ) { +#if !TARGET_CARBON // we have to deactive the top level windows manually - wxNode* node = wxTopLevelWindows.First(); + wxWindowListNode* node = wxTopLevelWindows.GetFirst(); while (node) { wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data(); - win->MacActivate( MacGetCurrentEvent() , 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->Next(); + node = node->GetNext(); } - s_lastMouseDown = 0 ; - if( convertClipboard ) - { - MacConvertPrivateToPublicScrap() ; - } + ::HideFloatingWindows() ; +#endif + s_lastMouseDown = 0 ; - ::HideFloatingWindows() ; + if( convertClipboard ) + { + MacConvertPrivateToPublicScrap() ; + } } +extern wxList wxModalDialogs; + void wxApp::MacResume( bool convertClipboard ) { - s_lastMouseDown = 0 ; - if( convertClipboard ) - { - MacConvertPublicToPrivateScrap() ; - } + s_lastMouseDown = 0 ; + if( convertClipboard ) + { + MacConvertPublicToPrivateScrap() ; + } + +#if !TARGET_CARBON + ::ShowFloatingWindows() ; + // raise modal dialogs in case a non modal window was selected to activate the app + + wxNode* node = wxModalDialogs.GetFirst(); + while (node) + { + wxDialog* dialog = (wxDialog *) node->GetData(); + dialog->Raise(); - ::ShowFloatingWindows() ; + node = node->GetNext(); + } +#endif } void wxApp::MacConvertPrivateToPublicScrap() @@ -1017,26 +1456,56 @@ void wxApp::MacConvertPublicToPrivateScrap() void wxApp::MacDoOneEvent() { - EventRecord event ; +#if TARGET_CARBON + EventRef theEvent; + + s_inReceiveEvent = true ; + OSStatus status = ReceiveNextEvent(0, NULL,sleepTime,true,&theEvent) ; + s_inReceiveEvent = false ; + if ( status == eventLoopTimedOutErr ) + { + if ( wxTheApp->ProcessIdle() ) + sleepTime = kEventDurationNoWait ; + else + sleepTime = kEventDurationForever ; + } + else if ( status == eventLoopQuitErr ) + { + // according to QA1061 this may also occur when a WakeUp Process + // is executed + } + else + { + MacHandleOneEvent( theEvent ) ; + ReleaseEvent(theEvent); + sleepTime = kEventDurationNoWait ; + } +#else + EventRecord event ; - long sleepTime = 1; // GetCaretTime() / 4 ; + EventMask eventMask = everyEvent ; - if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn)) + if (WaitNextEvent(eventMask, &event, sleepTime, (RgnHandle) s_macCursorRgn)) { + MacHandleModifierEvents( &event ) ; MacHandleOneEvent( &event ); } else { + MacHandleModifierEvents( &event ) ; // idlers WindowPtr window = ::FrontWindow() ; if ( window ) ::IdleControls( window ) ; - wxTheApp->ProcessIdle() ; + if ( wxTheApp->ProcessIdle() ) + sleepTime = 0 ; + else + sleepTime = GetCaretTime() / 2 ; } if ( event.what != kHighLevelEvent ) SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ; - +#endif // repeaters DeletePendingObjects() ; @@ -1045,6 +1514,12 @@ void wxApp::MacDoOneEvent() void wxApp::MacHandleOneEvent( WXEVENTREF evr ) { +#if TARGET_CARBON + EventTargetRef theTarget; + theTarget = GetEventDispatcherTarget(); + m_macCurrentEvent = evr ; + SendEventToEventTarget ((EventRef) evr , theTarget); +#else EventRecord* ev = (EventRecord*) evr ; m_macCurrentEvent = ev ; @@ -1096,17 +1571,63 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr ) default: break; } +#endif wxMacProcessNotifierAndPendingEvents() ; } +#if !TARGET_CARBON +bool s_macIsInModalLoop = false ; + +void wxApp::MacHandleModifierEvents( WXEVENTREF evr ) +{ + EventRecord* ev = (EventRecord*) evr ; + if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL ) + { + wxKeyEvent event(wxEVT_KEY_DOWN); + + event.m_shiftDown = ev->modifiers & shiftKey; + event.m_controlDown = ev->modifiers & controlKey; + event.m_altDown = ev->modifiers & optionKey; + event.m_metaDown = ev->modifiers & cmdKey; + + event.m_x = ev->where.h; + event.m_y = ev->where.v; + event.m_timeStamp = ev->when; + wxWindow* focus = wxWindow::FindFocus() ; + event.SetEventObject(focus); + + if ( (ev->modifiers ^ s_lastModifiers ) & controlKey ) + { + event.m_keyCode = WXK_CONTROL ; + event.SetEventType( ( ev->modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; + focus->GetEventHandler()->ProcessEvent( event ) ; + } + if ( (ev->modifiers ^ s_lastModifiers ) & shiftKey ) + { + event.m_keyCode = WXK_SHIFT ; + event.SetEventType( ( ev->modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; + focus->GetEventHandler()->ProcessEvent( event ) ; + } + if ( (ev->modifiers ^ s_lastModifiers ) & optionKey ) + { + event.m_keyCode = WXK_ALT ; + event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; + focus->GetEventHandler()->ProcessEvent( event ) ; + } + s_lastModifiers = ev->modifiers ; + } +} + void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr ) { + // we must avoid reentrancy problems when processing high level events eg printing + bool former = s_inYield ; + s_inYield = TRUE ; EventRecord* ev = (EventRecord*) evr ; ::AEProcessAppleEvent( ev ) ; + s_inYield = former ; } -bool s_macIsInModalLoop = false ; - void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) { EventRecord* ev = (EventRecord*) evr ; @@ -1136,16 +1657,14 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) else { UInt32 menuresult = MenuSelect(ev->where) ; - MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ); + MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ); s_lastMouseDown = 0; } break ; -#if !TARGET_CARBON case inSysWindow : SystemClick( ev , window ) ; s_lastMouseDown = 0; break ; -#endif case inDrag : if ( window != frontWindow && s_macIsInModalLoop && !(ev->modifiers & cmdKey ) ) { @@ -1159,7 +1678,7 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) GrafPtr port ; GetPort( &port ) ; Point pt = { 0, 0 } ; - SetPort( GetWindowPort(window) ) ; + SetPortWindowPort(window) ; LocalToGlobal( &pt ) ; SetPort( port ) ; win->SetSize( pt.h , pt.v , -1 , @@ -1178,23 +1697,28 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) break; case inGrow: { - int growResult = GrowWindow(window , ev->where, &screenBits.bounds); - if (growResult != 0) + Rect newContentRect ; + Rect constraintRect ; + constraintRect.top = win->GetMinHeight() ; + if ( constraintRect.top == -1 ) + constraintRect.top = 0 ; + constraintRect.left = win->GetMinWidth() ; + if ( constraintRect.left == -1 ) + constraintRect.left = 0 ; + constraintRect.right = win->GetMaxWidth() ; + if ( constraintRect.right == -1 ) + constraintRect.right = 32000 ; + constraintRect.bottom = win->GetMaxHeight() ; + if ( constraintRect.bottom == -1 ) + constraintRect.bottom = 32000 ; + + Boolean growResult = ResizeWindow( window , ev->where , + &constraintRect , &newContentRect ) ; + if ( growResult ) { - int newWidth = LoWord(growResult); - int newHeight = HiWord(growResult); - int oldWidth, oldHeight; - - - if (win) - { - win->GetSize(&oldWidth, &oldHeight); - if (newWidth == 0) - newWidth = oldWidth; - if (newHeight == 0) - newHeight = oldHeight; - win->SetSize( -1, -1, newWidth, newHeight, wxSIZE_USE_EXISTING); - } + win->SetSize( newContentRect.left , newContentRect.top , + newContentRect.right - newContentRect.left , + newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING); } s_lastMouseDown = 0; } @@ -1208,9 +1732,15 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) if (win) { Rect tempRect ; + GrafPtr port ; + GetPort( &port ) ; + Point pt = { 0, 0 } ; + SetPortWindowPort(window) ; + LocalToGlobal( &pt ) ; + SetPort( port ) ; GetWindowPortBounds(window, &tempRect ) ; - win->SetSize( -1, -1, tempRect.right-tempRect.left , + win->SetSize( pt.h , pt.v , tempRect.right-tempRect.left , tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING); } } @@ -1225,7 +1755,7 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) { GrafPtr port ; GetPort( &port ) ; - SetPort( GetWindowPort(window) ) ; + SetPortWindowPort(window) ; SetPort( port ) ; } if ( window != frontWindow && wxTheApp->s_captureWindow == NULL ) @@ -1252,7 +1782,6 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr ) win->MacMouseDown( ev , windowPart ) ; } break ; - default: break; } @@ -1263,7 +1792,16 @@ void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr ) EventRecord* ev = (EventRecord*) evr ; WindowRef window; - short windowPart = ::FindWindow(ev->where, &window); + short windowPart = inNoWindow ; + if ( wxTheApp->s_captureWindow ) + { + window = (WindowRef) s_captureWindow->MacGetRootWindow() ; + windowPart = inContent ; + } + else + { + windowPart = ::FindWindow(ev->where, &window) ; + } switch (windowPart) { @@ -1281,40 +1819,42 @@ void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr ) } } +#endif + long wxMacTranslateKey(unsigned char key, unsigned char code) ; long wxMacTranslateKey(unsigned char key, unsigned char code) { long retval = key ; switch (key) { - case 0x01 : + case kHomeCharCode : retval = WXK_HOME; break; - case 0x03 : + case kEnterCharCode : retval = WXK_RETURN; break; - case 0x04 : + case kEndCharCode : retval = WXK_END; break; - case 0x05 : + case kHelpCharCode : retval = WXK_HELP; break; - case 0x08 : + case kBackspaceCharCode : retval = WXK_BACK; break; - case 0x09 : + case kTabCharCode : retval = WXK_TAB; break; - case 0x0b : + case kPageUpCharCode : retval = WXK_PAGEUP; break; - case 0x0c : + case kPageDownCharCode : retval = WXK_PAGEDOWN; break; - case 0x0d : + case kReturnCharCode : retval = WXK_RETURN; break; - case 0x10 : + case kFunctionKeyCharCode : { switch( code ) { @@ -1366,22 +1906,22 @@ long wxMacTranslateKey(unsigned char key, unsigned char code) } } break ; - case 0x1b : + case kEscapeCharCode : retval = WXK_ESCAPE ; break ; - case 0x1c : + case kLeftArrowCharCode : retval = WXK_LEFT ; break ; - case 0x1d : + case kRightArrowCharCode : retval = WXK_RIGHT ; break ; - case 0x1e : + case kUpArrowCharCode : retval = WXK_UP ; break ; - case 0x1f : + case kDownArrowCharCode : retval = WXK_DOWN ; break ; - case 0x7F : + case kDeleteCharCode : retval = WXK_DELETE ; default: break ; @@ -1390,6 +1930,7 @@ long wxMacTranslateKey(unsigned char key, unsigned char code) return retval; } +#if !TARGET_CARBON void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) { EventRecord* ev = (EventRecord*) evr ; @@ -1399,89 +1940,149 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) if ( HiWord( menuresult ) ) { if ( !s_macIsInModalLoop ) - MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ; + MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ; } else { - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - long keyval = wxMacTranslateKey(keychar, keycode) ; - bool handled = false ; - wxWindow* focus = wxWindow::FindFocus() ; - if ( focus ) + 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 + wxControl* control = wxDynamicCast( focus , wxControl ) ; + if ( control && control->GetMacControl() != NULL ) + { + short keycode ; + short keychar ; + keychar = short(ev->message & charCodeMask); + keycode = short(ev->message & keyCodeMask) >> 8 ; + ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ; + } + } + } +} + +void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) +{ + EventRecord* ev = (EventRecord*) evr ; + wxToolTip::RemoveToolTips() ; + + UInt32 menuresult = UMAMenuEvent(ev) ; + if ( HiWord( menuresult ) ) + { + } + else + { + MacSendKeyUpEvent( wxWindow::FindFocus() , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ; + } +} + +#endif + +bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey ) +{ + if ( !focus ) + return false ; - wxKeyEvent event(wxEVT_KEY_DOWN); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - if ( !handled ) + 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); + keycode = short(keyInfo & keyCodeMask) >> 8 ; + } + 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 ) ; + } + + 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 ; + + event.m_x = wherex; + event.m_y = wherey; + event.m_timeStamp = when; + event.SetEventObject(focus); + handled = focus->GetEventHandler()->ProcessEvent( event ) ; + if ( handled && event.GetSkipped() ) + handled = false ; + if ( !handled ) + { +#if wxUSE_ACCEL + if (!handled) + { + wxWindow *ancestor = focus; + while (ancestor) { - #if wxUSE_ACCEL - if (!handled) + int command = ancestor->GetAcceleratorTable()->GetCommand( event ); + if (command != -1) { - wxWindow *ancestor = focus; - /* - while (ancestor) - { - int command = ancestor->GetAcceleratorTable()->GetCommand( event ); - if (command != -1) - { - wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); - handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); - break; - } - if (ancestor->m_isFrame) - break; - ancestor = ancestor->GetParent(); - } - */ + wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); + handled = ancestor->GetEventHandler()->ProcessEvent( command_event ); + break; } - #endif // wxUSE_ACCEL - } - if (!handled) - { - wxKeyEvent event(wxEVT_CHAR); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - handled = focus->GetEventHandler()->ProcessEvent( event ) ; - } - if ( !handled && - (keyval == WXK_TAB) && - (!focus->HasFlag(wxTE_PROCESS_TAB)) && - (focus->GetParent()) && - (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) - { - wxNavigationKeyEvent new_event; - new_event.SetEventObject( focus ); - new_event.SetDirection( !event.ShiftDown() ); - /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ - new_event.SetWindowChange( event.ControlDown() ); - new_event.SetCurrentFocus( focus ); - handled = focus->GetEventHandler()->ProcessEvent( new_event ); + if (ancestor->IsTopLevel()) + break; + ancestor = ancestor->GetParent(); } } - if ( !handled ) - { - // if window is not having a focus still testing for default enter or cancel - // TODO add the UMA version for ActiveNonFloatingWindow - focus = wxFindWinFromMacWindow( FrontWindow() ) ; +#endif // wxUSE_ACCEL + } + if (!handled) + { + 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) && +// CS: copied the change below from wxGTK +// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here the control may +// have this style, yet choose not to process this particular TAB in which +// case TAB must still work as a navigational character +#if 0 + (!focus->HasFlag(wxTE_PROCESS_TAB)) && +#endif + (focus->GetParent()) && + (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) + { + wxNavigationKeyEvent new_event; + new_event.SetEventObject( focus ); + new_event.SetDirection( !event.ShiftDown() ); + /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ + new_event.SetWindowChange( event.ControlDown() ); + new_event.SetCurrentFocus( focus ); + handled = focus->GetEventHandler()->ProcessEvent( new_event ); + if ( handled && new_event.GetSkipped() ) + handled = false ; + } + // backdoor handler for default return and command escape + if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) ) + { + // if window is not having a focus still testing for default enter or cancel + // TODO add the UMA version for ActiveNonFloatingWindow + wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ; if ( focus ) { if ( keyval == WXK_RETURN ) @@ -1493,57 +2094,64 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr ) wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); - return ; + return true ; } } /* generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) */ - else if (keyval == WXK_ESCAPE || (keyval == '.' && ev->modifiers & cmdKey ) ) + else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) ) { wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); new_event.SetEventObject( focus ); handled = focus->GetEventHandler()->ProcessEvent( new_event ); } } - } } + return handled ; } -void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) +bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey ) { - EventRecord* ev = (EventRecord*) evr ; - wxToolTip::RemoveToolTips() ; + if ( !focus ) + return false ; - UInt32 menuresult = UMAMenuEvent(ev) ; - if ( HiWord( menuresult ) ) + 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); + keycode = short(keyInfo & keyCodeMask) >> 8 ; } - else - { - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; + long keyval = wxMacTranslateKey(keychar, keycode) ; - wxWindow* focus = wxWindow::FindFocus() ; - if ( focus ) - { - long keyval = wxMacTranslateKey(keychar, keycode) ; - - wxKeyEvent event(wxEVT_KEY_UP); - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - event.m_keyCode = keyval; - event.m_x = ev->where.h; - event.m_y = ev->where.v; - event.m_timeStamp = ev->when; - event.SetEventObject(focus); - bool handled = focus->GetEventHandler()->ProcessEvent( event ) ; - } + if ( keyval == keychar ) + { + keyval = wxToupper( keyval ) ; } + bool handled = false ; + + wxKeyEvent event(wxEVT_KEY_UP); + event.m_shiftDown = modifiers & shiftKey; + event.m_controlDown = modifiers & controlKey; + event.m_altDown = modifiers & optionKey; + event.m_metaDown = modifiers & cmdKey; + event.m_keyCode = keyval ; + + event.m_x = wherex; + event.m_y = wherey; + event.m_timeStamp = when; + event.SetEventObject(focus); + handled = focus->GetEventHandler()->ProcessEvent( event ) ; + + return handled ; } +#if !TARGET_CARBON void wxApp::MacHandleActivateEvent( WXEVENTREF evr ) { EventRecord* ev = (EventRecord*) evr ; @@ -1560,7 +2168,7 @@ void wxApp::MacHandleActivateEvent( WXEVENTREF evr ) } wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; if ( win ) - win->MacActivate( ev , activate ) ; + win->MacActivate( ev->when , activate ) ; } } @@ -1589,14 +2197,12 @@ void wxApp::MacHandleDiskEvent( WXEVENTREF evr ) EventRecord* ev = (EventRecord*) evr ; if ( HiWord( ev->message ) != noErr ) { - #if !TARGET_CARBON OSErr err ; Point point ; SetPt( &point , 100 , 100 ) ; err = DIBadMount( point , ev->message ) ; wxASSERT( err == noErr ) ; -#endif } } @@ -1608,11 +2214,8 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) case suspendResumeMessage : { bool isResuming = ev->message & resumeFlag ; -#if !TARGET_CARBON bool convertClipboard = ev->message & convertClipboardFlag ; -#else - bool convertClipboard = false; -#endif + bool doesActivate = UMAGetProcessModeDoesActivateOnFGSwitch() ; if ( isResuming ) { @@ -1633,31 +2236,18 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) { wxTopLevelWindowMac* win = wxFindWinFromMacWindow( oldFrontWindow ) ; if ( win ) - win->MacActivate( ev , false ) ; + win->MacActivate( ev->when , false ) ; } if ( newFrontWindow ) { wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ; if ( win ) - win->MacActivate( ev , true ) ; + win->MacActivate( ev->when , true ) ; } } else { MacSuspend( convertClipboard ) ; - - // in case this suspending did close an active window, another one might - // have surfaced -> lets deactivate that one - -/* TODO : find out what to do on systems < 10 , perhaps FrontNonFloatingWindow - WindowRef newActiveWindow = ::ActiveNonFloatingWindow() ; - if ( newActiveWindow ) - { - wxWindow* win = wxFindWinFromMacWindow( newActiveWindow ) ; - if ( win ) - win->MacActivate( ev , false ) ; - } -*/ } } break ; @@ -1667,8 +2257,15 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) wxWindow* currentMouseWindow = NULL ; - wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , - ¤tMouseWindow ) ; + if (s_captureWindow ) + { + currentMouseWindow = s_captureWindow ; + } + else + { + wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , + ¤tMouseWindow ) ; + } if ( currentMouseWindow != wxWindow::s_lastMouseWindow ) { @@ -1691,61 +2288,82 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) if ( wxWindow::s_lastMouseWindow ) { - wxMouseEvent eventleave(event ) ; - eventleave.SetEventType( wxEVT_LEAVE_WINDOW ) ; + wxMouseEvent eventleave(event); + eventleave.SetEventType( wxEVT_LEAVE_WINDOW ); + wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y ); + eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ; + wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave); } if ( currentMouseWindow ) { - wxMouseEvent evententer(event ) ; - evententer.SetEventType( wxEVT_ENTER_WINDOW ) ; + wxMouseEvent evententer(event); + evententer.SetEventType( wxEVT_ENTER_WINDOW ); + currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y ); + evententer.SetEventObject( currentMouseWindow ) ; currentMouseWindow->GetEventHandler()->ProcessEvent(evententer); } wxWindow::s_lastMouseWindow = currentMouseWindow ; } - short windowPart = ::FindWindow(ev->where, &window); + short windowPart = inNoWindow ; + + if ( s_captureWindow ) + { + window = (WindowRef) s_captureWindow->MacGetRootWindow() ; + windowPart = inContent ; + } + else + { + windowPart = ::FindWindow(ev->where, &window); + } switch (windowPart) { - // fixes for setting the cursor back from dominic mazzoni - case inMenuBar : - UMAShowArrowCursor(); - break ; - case inSysWindow : - UMAShowArrowCursor(); - break ; - default: + case inContent : { - // if ( s_lastMouseDown == 0 ) - // ev->modifiers |= btnState ; - - // Calling GetNextEvent with a zero event mask will always - // pass back a null event. However, it fills the EventRecord - // with the state of the modifier keys. This is needed since - // the modifier state returned by WaitForNextEvent often is - // wrong mouse move events. The attempt above to correct this - // didn't always work (under OS X at least). - - EventRecord tmp; - ::GetNextEvent(0, &tmp); - ev->modifiers = tmp.modifiers; - wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ; if ( win ) win->MacMouseMoved( ev , windowPart ) ; else - UMAShowArrowCursor(); - + { + if ( wxIsBusy() ) + { + } + else + UMAShowArrowCursor(); + } } break; + default : + { + if ( wxIsBusy() ) + { + } + else + UMAShowArrowCursor(); + } + break ; } } break ; } } +#endif + +void wxApp::MacHandleMenuCommand( wxUint32 id ) +{ + 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 void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum ) { if (macMenuId == 0) @@ -1765,35 +2383,10 @@ void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum ) } else { - wxWindow* frontwindow = wxFindWinFromMacWindow( ::FrontWindow() ) ; - if ( frontwindow && wxMenuBar::MacGetInstalledMenuBar() ) - wxMenuBar::MacGetInstalledMenuBar()->MacMenuSelect( frontwindow->GetEventHandler() , 0 , macMenuId , macMenuItemNum ) ; + MenuCommand id ; + GetMenuItemCommandID( GetMenuHandle(macMenuId) , macMenuItemNum , &id ) ; + MacHandleMenuCommand( id ) ; } HiliteMenu(0); } - -/* -long wxApp::MacTranslateKey(char key, int mods) -{ -} - -void wxApp::MacAdjustCursor() -{ -} - -*/ -/* -void -wxApp::macAdjustCursor() -{ - if (ev->what != kHighLevelEvent) - { - wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow()); - if (theMacWxFrame) - { - if (!theMacWxFrame->MacAdjustCursor(ev->where)) - ::SetCursor(&(qd.arrow)); - } - } -} -*/ +#endif