X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..31a06b07cce898a22d0ca3992501e85da9c22f13:/src/mac/carbon/app.cpp?ds=sidebyside diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index fd5a0009b0..095156baa1 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -13,6 +13,7 @@ #pragma implementation "app.h" #endif +#include "wx/window.h" #include "wx/frame.h" #include "wx/app.h" #include "wx/utils.h" @@ -20,6 +21,7 @@ #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" @@ -28,7 +30,9 @@ #include "wx/log.h" #include "wx/module.h" #include "wx/memory.h" - +#include "wx/tooltip.h" +#include "wx/textctrl.h" +#include "wx/menu.h" #if wxUSE_WX_RESOURCES #include "wx/resource.h" #endif @@ -37,13 +41,25 @@ // mac -#if __option(profile) +#ifndef __DARWIN__ + #if __option(profile) #include -#endif + #endif +#endif #include "apprsrc.h" -#include +#include "wx/mac/uma.h" +#include "wx/mac/macnotfy.h" + +#if wxUSE_SOCKETS + #ifdef __DARWIN__ + #include + #else + #include + #include + #endif +#endif extern char *wxBuffer; extern wxList wxPendingDelete; @@ -56,6 +72,8 @@ wxApp *wxTheApp = NULL; 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) END_EVENT_TABLE() #endif @@ -71,39 +89,54 @@ wxWindow* wxApp::s_captureWindow = NULL ; int wxApp::s_lastMouseDown = 0 ; long wxApp::sm_lastMessageTime = 0; -#ifdef __WXMAC__ - bool wxApp::s_macDefaultEncodingIsPC = true ; bool wxApp::s_macSupportPCMenuShortcuts = true ; long wxApp::s_macAboutMenuItemId = wxID_ABOUT ; wxString wxApp::s_macHelpMenuTitleName = "&Help" ; -OSErr AEHandleODoc( AppleEvent *event , AppleEvent *reply , long refcon ) +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) +pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +#else +pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , unsigned long refcon ) +#endif { wxApp* app = (wxApp*) refcon ; - return wxTheApp->MacHandleAEODoc( event , reply) ; + return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ; } -OSErr AEHandleOApp( AppleEvent *event , AppleEvent *reply , long refcon ) +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) +pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) +#else +pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , unsigned long refcon ) +#endif { wxApp* app = (wxApp*) refcon ; - return wxTheApp->MacHandleAEOApp( event , reply ) ; + return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ; } -OSErr AEHandlePDoc( AppleEvent *event , AppleEvent *reply , long refcon ) +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) +pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) +#else +pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , unsigned long refcon ) +#endif { wxApp* app = (wxApp*) refcon ; - return wxTheApp->MacHandleAEPDoc( event , reply ) ; + return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ; } -OSErr AEHandleQuit( AppleEvent *event , AppleEvent *reply , long refcon ) +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) +pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) +#else +pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , unsigned long refcon ) +#endif { wxApp* app = (wxApp*) refcon ; - return wxTheApp->MacHandleAEQuit( event , reply) ; + return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ; } -OSErr wxApp::MacHandleAEODoc(AppleEvent *event , AppleEvent *reply) +OSErr wxApp::MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply) { + SysBeep(40) ; ProcessSerialNumber PSN ; PSN.highLongOfPSN = 0 ; PSN.lowLongOfPSN = kCurrentProcess ; @@ -111,17 +144,17 @@ OSErr wxApp::MacHandleAEODoc(AppleEvent *event , AppleEvent *reply) return noErr ; } -OSErr wxApp::MacHandleAEPDoc(AppleEvent *event , AppleEvent *reply) +OSErr wxApp::MacHandleAEPDoc(const AppleEvent *event , AppleEvent *reply) { return noErr ; } -OSErr wxApp::MacHandleAEOApp(AppleEvent *event , AppleEvent *reply) +OSErr wxApp::MacHandleAEOApp(const AppleEvent *event , AppleEvent *reply) { return noErr ; } -OSErr wxApp::MacHandleAEQuit(AppleEvent *event , AppleEvent *reply) +OSErr wxApp::MacHandleAEQuit(const AppleEvent *event , AppleEvent *reply) { wxWindow* win = GetTopWindow() ; if ( win ) @@ -135,14 +168,14 @@ OSErr wxApp::MacHandleAEQuit(AppleEvent *event , AppleEvent *reply) return noErr ; } -char StringMac[] = "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f" +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[] = "\xC4\xC5\xC7\xC9\xD1\xD6\xDC\xE1\xE0\xE2\xE4\xE3\xE5\xE7\xE9\xE8" +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" @@ -160,7 +193,7 @@ void wxMacConvertFromPC( const char *from , char *to , int len ) if ( c != NULL ) { *to = StringMac[ c - StringANSI] ; - } + } ++to ; ++from ; } @@ -173,7 +206,7 @@ void wxMacConvertFromPC( const char *from , char *to , int len ) if ( c != NULL ) { *to = StringMac[ c - StringANSI] ; - } + } else { *to = *from ; @@ -195,7 +228,7 @@ void wxMacConvertToPC( const char *from , char *to , int len ) if ( c != NULL ) { *to = StringANSI[ c - StringMac] ; - } + } ++to ; ++from ; } @@ -208,7 +241,7 @@ void wxMacConvertToPC( const char *from , char *to , int len ) if ( c != NULL ) { *to = StringANSI[ c - StringMac] ; - } + } else { *to = *from ; @@ -219,19 +252,19 @@ void wxMacConvertToPC( const char *from , char *to , int len ) } } -void wxMacConvertFromPC( char * p ) +void wxMacConvertFromPC( char * p ) { char *ptr = p ; int len = strlen ( p ) ; - + wxMacConvertFromPC( ptr , ptr , len ) ; } -void wxMacConvertFromPCForControls( char * p ) +void wxMacConvertFromPCForControls( char * p ) { char *ptr = p ; int len = strlen ( p ) ; - + wxMacConvertFromPC( ptr , ptr , len ) ; for ( int i = 0 ; i < strlen ( ptr ) ; i++ ) { @@ -242,22 +275,22 @@ void wxMacConvertFromPCForControls( char * p ) } } -void wxMacConvertFromPC( unsigned char *p ) +void wxMacConvertFromPC( unsigned char *p ) { char *ptr = (char*) p + 1 ; int len = p[0] ; - + wxMacConvertFromPC( ptr , ptr , len ) ; } extern char *wxBuffer ; -wxString wxMacMakeMacStringFromPC( const char * p ) +wxString wxMacMakeMacStringFromPC( const char * p ) { const char *ptr = p ; int len = strlen ( p ) ; char *buf = wxBuffer ; - + if ( len >= BUFSIZ + 512 ) { buf = new char [len+1] ; @@ -272,28 +305,28 @@ wxString wxMacMakeMacStringFromPC( const char * p ) } -void wxMacConvertToPC( char * p ) +void wxMacConvertToPC( char * p ) { char *ptr = p ; int len = strlen ( p ) ; - + wxMacConvertToPC( ptr , ptr , len ) ; } -void wxMacConvertToPC( unsigned char *p ) +void wxMacConvertToPC( unsigned char *p ) { char *ptr = (char*) p + 1 ; int len = p[0] ; - + wxMacConvertToPC( ptr , ptr , len ) ; } -wxString wxMacMakePCStringFromMac( const char * p ) +wxString wxMacMakePCStringFromMac( const char * p ) { const char *ptr = p ; int len = strlen ( p ) ; char *buf = wxBuffer ; - + if ( len >= BUFSIZ + 512 ) { buf = new char [len+1] ; @@ -301,37 +334,89 @@ wxString wxMacMakePCStringFromMac( const char * p ) wxMacConvertToPC( ptr , buf , len ) ; buf[len] = 0 ; - + wxString result( buf ) ; if ( buf != wxBuffer ) delete buf ; return result ; } -#endif +wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) +{ + if (mac2pcEncoding) + { + return wxMacMakePCStringFromMac( from ) ; + } + else + { + return wxString( from ) ; + } +} + +wxString wxMacMakeStringFromPascal( StringPtr from , bool mac2pcEncoding ) +{ + // this is safe since a pascal string can never be larger than 256 bytes + char s[256] ; + CopyPascalStringToC( from , s ) ; + if (mac2pcEncoding) + { + return wxMacMakePCStringFromMac( s ) ; + } + else + { + return wxString( s ) ; + } +} + +void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) +{ + if (pc2macEncoding) + { + CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ; + } + else + { + CopyCStringToPascal( from , to ) ; + } +} bool wxApp::Initialize() { int error = 0 ; - + // Mac-specific - + UMAInitToolbox( 4 ) ; + SetEventMask( everyEvent ) ; UMAShowWatchCursor() ; - 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 0 - GUSISetup(GUSIwithInternetSockets); +#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 ) ; #endif - + +#ifndef __DARWIN__ // test the minimal configuration necessary + #if !TARGET_CARBON long theSystem ; - long theMachine; + long theMachine; if (Gestalt(gestaltMachineType, &theMachine) != noErr) { @@ -344,12 +429,11 @@ bool wxApp::Initialize() else if (Gestalt(gestaltSystemVersion, &theSystem) != noErr ) { error = kMacSTROldSystem ; - } + } else if ( theSystem < 0x0750 ) { error = kMacSTROldSystem ; } - #if !TARGET_CARBON else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap) { error = kMacSTRSmallSize; @@ -364,11 +448,12 @@ bool wxApp::Initialize() } } */ +#endif // if we encountered any problems so far, give the error code and exit immediately - + if ( error ) - { + { short itemHit; Str255 message; @@ -377,16 +462,20 @@ bool wxApp::Initialize() ParamText("\pFatal Error", message, (ConstStr255Param)"\p", (ConstStr255Param)"\p"); itemHit = Alert(128, nil); return FALSE ; - } + } -#if __option(profile) - ProfilerInit( collectDetailed, bestTimeBase , 20000 , 30 ) ; -#endif +#ifndef __DARWIN__ + #if __option(profile) + ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ; + #endif +#endif // now avoid exceptions thrown for new (bad_alloc) - + +#ifndef __DARWIN__ std::__throws_bad_alloc = FALSE ; - +#endif + s_macCursorRgn = ::NewRgn() ; #ifdef __WXMSW__ @@ -395,20 +484,31 @@ bool wxApp::Initialize() wxBuffer = new char[BUFSIZ + 512]; #endif -/* No longer used -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + wxClassInfo::InitializeClasses(); - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); +#if wxUSE_RESOURCES +// wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); #endif -*/ - - wxClassInfo::InitializeClasses(); +#if wxUSE_THREADS + wxPendingEventsLocker = new wxCriticalSection; +#endif wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); wxTheColourDatabase->Initialize(); +#ifdef __WXDEBUG__ +#if wxUSE_LOG + // flush the logged messages if any and install a 'safer' log target: the + // default one (wxLogGui) can't be used after the resources are freed just + // below and the user suppliedo ne might be even more unsafe (using any + // wxWindows GUI function is unsafe starting from now) + wxLog::DontCreateOnDemand(); + + // this will flush the old messages if any + delete wxLog::SetActiveTarget(new wxLogStderr); +#endif // wxUSE_LOG +#endif + wxInitializeStockLists(); wxInitializeStockObjects(); @@ -419,19 +519,36 @@ bool wxApp::Initialize() wxBitmap::InitStandardHandlers(); wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) + if (!wxModule::InitializeModules()) { return FALSE; + } wxWinMacWindowList = new wxList(wxKEY_INTEGER); wxWinMacControlList = new wxList(wxKEY_INTEGER); - UMAShowArrowCursor() ; + wxMacCreateNotifierTable() ; + + UMAShowArrowCursor() ; return TRUE; } void wxApp::CleanUp() { +#if wxUSE_LOG + // flush the logged messages if any and install a 'safer' log target: the + // default one (wxLogGui) can't be used after the resources are freed just + // below and the user suppliedo ne might be even more unsafe (using any + // wxWindows GUI function is unsafe starting from now) + wxLog::DontCreateOnDemand(); + + // this will flush the old messages if any + delete wxLog::SetActiveTarget(new wxLogStderr); +#endif // wxUSE_LOG + + // One last chance for pending objects to be cleaned up + wxTheApp->DeletePendingObjects(); + wxModule::CleanUpModules(); #if wxUSE_WX_RESOURCES @@ -440,19 +557,8 @@ void wxApp::CleanUp() wxDeleteStockObjects() ; - // Destroy all GDI lists, etc. - - delete wxTheBrushList; - wxTheBrushList = NULL; - - delete wxThePenList; - wxThePenList = NULL; - - delete wxTheFontList; - wxTheFontList = NULL; - - delete wxTheBitmapList; - wxTheBitmapList = NULL; + // Destroy all GDI lists, etc. + wxDeleteStockLists(); delete wxTheColourDatabase; wxTheColourDatabase = NULL; @@ -462,69 +568,89 @@ void wxApp::CleanUp() delete[] wxBuffer; wxBuffer = NULL; + wxMacDestroyNotifierTable() ; if (wxWinMacWindowList) delete wxWinMacWindowList ; + delete wxPendingEvents; +#if wxUSE_THREADS + delete wxPendingEventsLocker; + // If we don't do the following, we get an apparent memory leak. + ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); +#endif + wxClassInfo::CleanUpClasses(); -#if __option(profile) - ProfilerDump( "\papp.prof" ) ; - ProfilerTerm() ; -#endif +#ifndef __DARWIN__ + #if __option(profile) + ProfilerDump( "\papp.prof" ) ; + ProfilerTerm() ; + #endif +#endif delete wxTheApp; wxTheApp = NULL; - + #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxTrace("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } -// wxDebugContext::SetStream(NULL, NULL); + // At this point we want to check if there are any memory + // blocks that aren't part of the wxDebugContext itself, + // as a special case. Then when dumping we need to ignore + // wxDebugContext, too. + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) + { + wxLogDebug(wxT("There were memory leaks.")); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); + } + // wxDebugContext::SetStream(NULL, NULL); #endif - - // do it as the very last thing because everything else can log messages - wxLog::DontCreateOnDemand(); - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); - ::PrClose() ; +#if wxUSE_LOG + // do it as the very last thing because everything else can log messages + delete wxLog::SetActiveTarget(NULL); +#endif // wxUSE_LOG + + UMACleanupToolbox() ; if (s_macCursorRgn) ::DisposeRgn(s_macCursorRgn); + #if 0 TerminateAE() ; #endif } -int wxEntry( int argc, char *argv[] ) +int wxEntry( int argc, char *argv[] , bool enterLoop ) { - if (!wxApp::Initialize()) - return FALSE; - if (!wxTheApp) - { - if (!wxApp::GetInitializerFunction()) +#ifdef __MWERKS__ +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + // This seems to be necessary since there are 'rogue' + // objects present at this point (perhaps global objects?) + // Setting a checkpoint will ignore them as far as the + // memory checking facility is concerned. + // Of course you may argue that memory allocated in globals should be + // checked, but this is a reasonable compromise. + wxDebugContext::SetCheckpoint(); +#endif +#endif + if (!wxApp::Initialize()) { + return 0; + } + // create the application object or ensure that one already exists + if (!wxTheApp) { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - }; - - wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) (); - }; - - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - }; + // The app may have declared a global application object, but we recommend + // the IMPLEMENT_APP macro is used instead, which sets an initializer + // function for delayed, dynamic app object construction. + wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, + wxT("No initializer - use IMPLEMENT_APP macro.") ); + + wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) (); + } + + wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); #ifdef __WXMAC__ - argc = 1 ; // currently we don't support files as parameters + argc = 0 ; // currently we don't support files as parameters #endif wxTheApp->argc = argc; @@ -532,50 +658,66 @@ int wxEntry( int argc, char *argv[] ) // GUI-specific initialization, such as creating an app context. wxTheApp->OnInitGui(); - + // we could try to get the open apple events here to adjust argc and argv better - + // Here frames insert themselves automatically // into wxTopLevelWindows by getting created // in OnInit(). - - if (!wxTheApp->OnInit()) return 0; int retValue = 0; - - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); - if (wxTheApp->GetTopWindow()) - { - delete wxTheApp->GetTopWindow(); - wxTheApp->SetTopWindow(NULL); - } - - wxTheApp->DeletePendingObjects(); - - wxTheApp->OnExit(); - - wxApp::CleanUp(); + if ( wxTheApp->OnInit() ) + { + if ( enterLoop ) + { + retValue = wxTheApp->OnRun(); + } + else + // We want to initialize, but not run or exit immediately. + return 1; + } + //else: app initialization failed, so we skipped OnRun() - return retValue; -}; + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if ( topWindow ) + { + // Forcibly delete the window. + if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || + topWindow->IsKindOf(CLASSINFO(wxDialog)) ) + { + topWindow->Close(TRUE); + wxTheApp->DeletePendingObjects(); + } + else + { + delete topWindow; + wxTheApp->SetTopWindow(NULL); + } + } + + wxTheApp->OnExit(); + + wxApp::CleanUp(); + + return retValue; +} // Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { m_topWindow = NULL; wxTheApp = this; - m_className = ""; + m_wantDebugOutput = TRUE ; - m_appName = ""; + argc = 0; argv = NULL; m_printMode = wxPRINT_WINDOWS; - m_exitOnFrameDelete = TRUE; m_auto3D = TRUE; } @@ -631,13 +773,14 @@ void wxApp::Dispatch() void wxApp::OnIdle(wxIdleEvent& event) { - static bool inOnIdle = FALSE; + static bool s_inOnIdle = FALSE; + + // Avoid recursion (via ProcessEvent default case) + if ( s_inOnIdle ) + return; - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; - inOnIdle = TRUE; + s_inOnIdle = TRUE; // 'Garbage' collection of windows deleted with Close(). DeletePendingObjects(); @@ -653,7 +796,17 @@ void wxApp::OnIdle(wxIdleEvent& event) if (needMore) event.RequestMore(TRUE); - inOnIdle = FALSE; + // If they are pending events, we must process them: pending events are + // either events to the threads other than main or events posted with + // wxPostEvent() functions + wxMacProcessNotifierAndPendingEvents(); + + s_inOnIdle = FALSE; +} + +void wxWakeUpIdle() +{ + wxMacWakeUp() ; } // Send idle event to all top-level windows @@ -702,7 +855,7 @@ void wxApp::DeletePendingObjects() while (node) { wxObject *obj = (wxObject *)node->Data(); - + delete obj; if (wxPendingDelete.Member(obj)) @@ -714,75 +867,146 @@ void wxApp::DeletePendingObjects() } } -wxLog* wxApp::CreateLogTarget() +wxIcon +wxApp::GetStdIcon(int which) const { - return new wxLogGui; -} + switch(which) + { + case wxICON_INFORMATION: + return wxIcon("wxICON_INFO"); -wxWindow* wxApp::GetTopWindow() const -{ - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.Number() > 0) - return (wxWindow*) wxTopLevelWindows.First()->Data(); - else - return NULL; + 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() { - wxApp::CleanUp(); + wxLogError(_("Fatal error: exiting")); + + wxApp::CleanUp(); ::ExitToShell() ; } +void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) +{ + if (GetTopWindow()) + GetTopWindow()->Close(TRUE); +} + +// Default behaviour: close the application with prompts. The +// user can veto the close, and therefore the end session. +void wxApp::OnQueryEndSession(wxCloseEvent& event) +{ + if (GetTopWindow()) + { + if (!GetTopWindow()->Close(!event.CanVeto())) + event.Veto(TRUE); + } +} + +extern "C" void wxCYield() ; +void wxCYield() +{ + wxYield() ; +} + // Yield to other processes + +static bool gs_inYield = FALSE; + bool wxYield() { -// YieldToAnyThread() ; - SystemTask() ; - return TRUE; +#ifdef __WXDEBUG__ + if (gs_inYield) + wxFAIL_MSG( wxT("wxYield called recursively" ) ); +#endif + + gs_inYield = TRUE; + +#if wxUSE_THREADS + YieldToAnyThread() ; +#endif + EventRecord event ; + + long sleepTime = 1 ; //::GetCaretTime(); + + while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, wxApp::s_macCursorRgn)) + { + wxTheApp->MacHandleOneEvent( &event ); + if ( event.what != kHighLevelEvent ) + SetRectRgn( wxApp::s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ; + } + + wxMacProcessNotifierAndPendingEvents() ; + + gs_inYield = FALSE; + + return TRUE; } -// platform specifics +// Yield to incoming messages; but fail silently if recursion is detected. +bool wxYieldIfNeeded() +{ + if (gs_inYield) + return FALSE; + + return wxYield(); +} + +// platform specifics void wxApp::MacSuspend( bool convertClipboard ) { + // we have to deactive the window manually + + wxWindow* window = GetTopWindow() ; + if ( window ) + window->MacActivate( MacGetCurrentEvent() , false ) ; + s_lastMouseDown = 0 ; - if( convertClipboard ) + if( convertClipboard ) { MacConvertPrivateToPublicScrap() ; } - + UMAHideFloatingWindows() ; } void wxApp::MacResume( bool convertClipboard ) { s_lastMouseDown = 0 ; - if( convertClipboard ) + if( convertClipboard ) { MacConvertPublicToPrivateScrap() ; } - + UMAShowFloatingWindows() ; } void wxApp::MacConvertPrivateToPublicScrap() { - ::ZeroScrap(); - ::TEToScrap(); } void wxApp::MacConvertPublicToPrivateScrap() { - ::TEFromScrap() ; } -void wxApp::MacDoOneEvent() +void wxApp::MacDoOneEvent() { EventRecord event ; - long sleepTime = ::GetCaretTime(); + long sleepTime = 1 ; // GetCaretTime() / 4 ; if (WaitNextEvent(everyEvent, &event,sleepTime, s_macCursorRgn)) { @@ -794,25 +1018,24 @@ void wxApp::MacDoOneEvent() WindowPtr window = UMAFrontWindow() ; if ( window ) UMAIdleControls( window ) ; - + wxTheApp->ProcessIdle() ; } if ( event.what != kHighLevelEvent ) - SetRectRgn( s_macCursorRgn , event.where.h - 1 , event.where.v - 1, event.where.h + 1 , event.where.v + 1 ) ; + SetRectRgn( s_macCursorRgn , event.where.h , event.where.v , event.where.h + 1 , event.where.v + 1 ) ; // repeaters -#if 0 - wxMacProcessSocketEvents() ; -#endif + DeletePendingObjects() ; + wxMacProcessNotifierAndPendingEvents() ; } -void wxApp::MacHandleOneEvent( EventRecord *ev ) +void wxApp::MacHandleOneEvent( EventRecord *ev ) { m_macCurrentEvent = ev ; - + wxApp::sm_lastMessageTime = ev->when ; - + switch (ev->what) { case mouseDown: @@ -830,7 +1053,7 @@ void wxApp::MacHandleOneEvent( EventRecord *ev ) else { ev->modifiers &= ~controlKey ; - } + } MacHandleMouseUpEvent( ev ) ; s_lastMouseDown = 0; break; @@ -859,6 +1082,7 @@ void wxApp::MacHandleOneEvent( EventRecord *ev ) default: break; } + wxMacProcessNotifierAndPendingEvents() ; } void wxApp::MacHandleHighLevelEvent( EventRecord *ev ) @@ -870,19 +1094,26 @@ bool s_macIsInModalLoop = false ; void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) { + wxToolTip::RemoveToolTips() ; + WindowRef window; WindowRef frontWindow = UMAFrontNonFloatingWindow() ; WindowAttributes frontWindowAttributes = NULL ; if ( frontWindow ) UMAGetWindowAttributes( frontWindow , &frontWindowAttributes ) ; - + short windowPart = ::FindWindow(ev->where, &window); wxWindow* win = wxFindWinFromMacWindow( window ) ; - + if ( wxPendingDelete.Member(win) ) + return ; + + BitMap screenBits; + GetQDGlobalsScreenBits( &screenBits ); + switch (windowPart) { case inMenuBar : - if ( s_macIsInModalLoop ) + if ( s_macIsInModalLoop ) { SysBeep ( 30 ) ; } @@ -893,10 +1124,12 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) 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 ) ) { @@ -904,17 +1137,21 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) } else { - DragWindow(window, ev->where, &qd.screenBits.bounds); + DragWindow(window, ev->where, &screenBits.bounds); if (win) { GrafPtr port ; GetPort( &port ) ; Point pt = { 0, 0 } ; - SetPort( window ) ; + #if TARGET_CARBON + SetPort( GetWindowPort(window) ) ; + #else + SetPort( (window) ) ; + #endif SetOrigin( 0 , 0 ) ; LocalToGlobal( &pt ) ; SetPort( port ) ; - win->SetSize( pt.h , pt.v , -1 , + win->SetSize( pt.h , pt.v , -1 , -1 , wxSIZE_USE_EXISTING); } s_lastMouseDown = 0; @@ -929,23 +1166,27 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) s_lastMouseDown = 0; break; case inGrow: - int growResult = GrowWindow(window , ev->where, &qd.screenBits.bounds); + { + int growResult = GrowWindow(window , ev->where, &screenBits.bounds); if (growResult != 0) { int newWidth = LoWord(growResult); int newHeight = HiWord(growResult); int oldWidth, oldHeight; - - win->GetSize(&oldWidth, &oldHeight); - if (newWidth == 0) - newWidth = oldWidth; - if (newHeight == 0) - newHeight = 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); + } } s_lastMouseDown = 0; + } break; case inZoomIn: case inZoomOut: @@ -954,8 +1195,13 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) // TODO setup size event ZoomWindow( window , windowPart , false ) ; if (win) - win->SetSize( -1, -1, window->portRect.right-window->portRect.left , - window->portRect.bottom-window->portRect.top, wxSIZE_USE_EXISTING); + { + Rect tempRect ; + + GetWindowPortBounds(window, &tempRect ) ; + win->SetSize( -1, -1, tempRect.right-tempRect.left , + tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING); + } } s_lastMouseDown = 0; break; @@ -965,9 +1211,20 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) break ; case inContent : - if ( window != frontWindow ) { - if ( s_macIsInModalLoop ) + GrafPtr port ; + GetPort( &port ) ; + #if TARGET_CARBON + SetPort( GetWindowPort(window) ) ; + #else + SetPort( (window) ) ; + #endif + SetOrigin( 0 , 0 ) ; + SetPort( port ) ; + } + if ( window != frontWindow && wxTheApp->s_captureWindow == NULL ) + { + if ( s_macIsInModalLoop ) { SysBeep ( 30 ) ; } @@ -978,6 +1235,8 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) } else { + if ( win ) + win->MacMouseDown( ev , windowPart ) ; UMASelectWindow( window ) ; } } @@ -987,7 +1246,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) win->MacMouseDown( ev , windowPart ) ; } break ; - + default: break; } @@ -996,9 +1255,9 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev ) void wxApp::MacHandleMouseUpEvent( EventRecord *ev ) { WindowRef window; - + short windowPart = ::FindWindow(ev->where, &window); - + switch (windowPart) { case inMenuBar : @@ -1015,144 +1274,244 @@ void wxApp::MacHandleMouseUpEvent( EventRecord *ev ) } } -long wxMacTranslateKey(char key, char code) -{ - switch (key) +long wxMacTranslateKey(unsigned char key, unsigned char code) +{ + long retval = key ; + switch (key) { case 0x01 : - key = WXK_HOME; + retval = WXK_HOME; break; case 0x03 : - key = WXK_RETURN; + retval = WXK_RETURN; break; case 0x04 : - key = WXK_END; + retval = WXK_END; break; case 0x05 : - key = WXK_HELP; + retval = WXK_HELP; break; case 0x08 : - key = WXK_BACK; + retval = WXK_BACK; break; case 0x09 : - key = WXK_TAB; + retval = WXK_TAB; break; case 0x0b : - key = WXK_PAGEUP; + retval = WXK_PAGEUP; break; case 0x0c : - key = WXK_PAGEDOWN; + retval = WXK_PAGEDOWN; break; case 0x0d : - key = WXK_RETURN; + retval = WXK_RETURN; break; case 0x10 : { switch( code ) { case 0x7a : - key = WXK_F1 ; + retval = WXK_F1 ; break; case 0x78 : - key = WXK_F2 ; + retval = WXK_F2 ; break; case 0x63 : - key = WXK_F3 ; + retval = WXK_F3 ; break; case 0x76 : - key = WXK_F4 ; + retval = WXK_F4 ; break; case 0x60 : - key = WXK_F5 ; + retval = WXK_F5 ; break; case 0x61 : - key = WXK_F6 ; + retval = WXK_F6 ; break; case 0x62: - key = WXK_F7 ; + retval = WXK_F7 ; break; case 0x64 : - key = WXK_F8 ; + retval = WXK_F8 ; break; case 0x65 : - key = WXK_F9 ; + retval = WXK_F9 ; break; case 0x6D : - key = WXK_F10 ; + retval = WXK_F10 ; break; case 0x67 : - key = WXK_F11 ; + retval = WXK_F11 ; break; case 0x6F : - key = WXK_F12 ; + retval = WXK_F12 ; break; case 0x69 : - key = WXK_F13 ; + retval = WXK_F13 ; break; case 0x6B : - key = WXK_F14 ; + retval = WXK_F14 ; break; case 0x71 : - key = WXK_F15 ; + retval = WXK_F15 ; break; } } break ; case 0x1b : - key = WXK_DELETE ; + retval = WXK_ESCAPE ; break ; case 0x1c : - key = WXK_LEFT ; + retval = WXK_LEFT ; break ; case 0x1d : - key = WXK_RIGHT ; + retval = WXK_RIGHT ; break ; case 0x1e : - key = WXK_UP ; + retval = WXK_UP ; break ; case 0x1f : - key = WXK_DOWN ; + retval = WXK_DOWN ; break ; + case 0x7F : + retval = WXK_DELETE ; default: break ; } // end switch - - return key; + + return retval; } void wxApp::MacHandleKeyDownEvent( EventRecord *ev ) { + wxToolTip::RemoveToolTips() ; + UInt32 menuresult = UMAMenuEvent(ev) ; if ( HiWord( menuresult ) ) + { + if ( !s_macIsInModalLoop ) MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ; + } else { short keycode ; short keychar ; keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - + keycode = short(ev->message & keyCodeMask) >> 8 ; + wxWindow* focus = wxWindow::FindFocus() ; if ( focus ) { - wxKeyEvent event(wxEVT_CHAR); + long keyval = wxMacTranslateKey(keychar, keycode) ; + + 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 = wxMacTranslateKey(keychar, keycode); + event.m_keyCode = keyval; event.m_x = ev->where.h; event.m_y = ev->where.v; event.m_timeStamp = ev->when; event.SetEventObject(focus); - focus->GetEventHandler()->ProcessEvent( event ) ; + bool handled = focus->GetEventHandler()->ProcessEvent( event ) ; + if ( !handled ) + { + #if wxUSE_ACCEL + if (!handled) + { + 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(); + } + */ + } + #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 ); + } + /* generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) */ + if ( (!handled) && + (keyval == '.' && event.ControlDown() ) ) + { + wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); + new_event.SetEventObject( focus ); + handled = focus->GetEventHandler()->ProcessEvent( new_event ); + } } } } void wxApp::MacHandleKeyUpEvent( EventRecord *ev ) { - // nothing to do + wxToolTip::RemoveToolTips() ; + + UInt32 menuresult = UMAMenuEvent(ev) ; + if ( HiWord( menuresult ) ) + { + } + else + { + short keycode ; + short keychar ; + keychar = short(ev->message & charCodeMask); + keycode = short(ev->message & keyCodeMask) >> 8 ; + + 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 ) ; + } + } } void wxApp::MacHandleActivateEvent( EventRecord *ev ) @@ -1180,7 +1539,16 @@ void wxApp::MacHandleUpdateEvent( EventRecord *ev ) wxWindow * win = wxFindWinFromMacWindow( window ) ; if ( win ) { - win->MacUpdate( ev ) ; + if ( !wxPendingDelete.Member(win) ) + win->MacUpdate( ev ) ; + } + else + { + // since there is no way of telling this foreign window to update itself + // we have to invalidate the update region otherwise we keep getting the same + // event over and over again + BeginUpdate( window ) ; + EndUpdate( window ) ; } } @@ -1188,12 +1556,14 @@ void wxApp::MacHandleDiskEvent( EventRecord *ev ) { if ( HiWord( ev->message ) != noErr ) { + #if !TARGET_CARBON OSErr err ; Point point ; SetPt( &point , 100 , 100 ) ; - - err = DIBadMount( point , ev->message ) ; + + err = DIBadMount( point , ev->message ) ; wxASSERT( err == noErr ) ; +#endif } } @@ -1204,23 +1574,27 @@ void wxApp::MacHandleOSEvent( EventRecord *ev ) 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 ) { WindowRef oldFrontWindow = NULL ; WindowRef newFrontWindow = NULL ; - + // in case we don't take care of activating ourselves, we have to synchronize // our idea of the active window with the process manager's - which it already activated - + if ( !doesActivate ) oldFrontWindow = UMAFrontNonFloatingWindow() ; - + MacResume( convertClipboard ) ; - + newFrontWindow = UMAFrontNonFloatingWindow() ; - + if ( oldFrontWindow ) { wxWindow* win = wxFindWinFromMacWindow( oldFrontWindow ) ; @@ -1235,12 +1609,12 @@ void wxApp::MacHandleOSEvent( EventRecord *ev ) } } else - { + { MacSuspend( convertClipboard ) ; - - // in case this suspending did close an active window, another one might + + // in case this suspending did close an active window, another one might // have surfaced -> lets deactivate that one - + WindowRef newActiveWindow = UMAGetActiveNonFloatingWindow() ; if ( newActiveWindow ) { @@ -1254,30 +1628,31 @@ void wxApp::MacHandleOSEvent( EventRecord *ev ) case mouseMovedMessage : { WindowRef window; - + wxWindow* currentMouseWindow = NULL ; - - MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , ¤tMouseWindow ) ; - + + wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , + ¤tMouseWindow ) ; + if ( currentMouseWindow != wxWindow::s_lastMouseWindow ) { wxMouseEvent event ; - + bool isDown = !(ev->modifiers & btnState) ; // 1 is for up bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse - + event.m_leftDown = isDown && !controlDown; event.m_middleDown = FALSE; - event.m_rightDown = isDown && controlDown; + event.m_rightDown = isDown && controlDown; 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_metaDown = ev->modifiers & cmdKey; event.m_x = ev->where.h; - event.m_y = ev->where.v; + event.m_y = ev->where.v; event.m_timeStamp = ev->when; event.SetEventObject(this); - + if ( wxWindow::s_lastMouseWindow ) { wxMouseEvent eventleave(event ) ; @@ -1292,43 +1667,49 @@ void wxApp::MacHandleOSEvent( EventRecord *ev ) } wxWindow::s_lastMouseWindow = currentMouseWindow ; } - + short 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: - { + { if ( s_lastMouseDown == 0 ) ev->modifiers |= btnState ; wxWindow* win = wxFindWinFromMacWindow( window ) ; if ( win ) win->MacMouseMoved( ev , windowPart ) ; + else + UMAShowArrowCursor(); + } break; } } break ; - + } } void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum ) { - if (macMenuId == 0) + if (macMenuId == 0) return; // no menu item selected - - if (macMenuId == kwxMacAppleMenuId && macMenuItemNum > 1) + + if (macMenuId == kwxMacAppleMenuId && macMenuItemNum > 1) { #if ! TARGET_CARBON Str255 deskAccessoryName ; GrafPtr savedPort ; - + GetMenuItemText(GetMenuHandle(kwxMacAppleMenuId), macMenuItemNum, deskAccessoryName); GetPort(&savedPort); OpenDeskAcc(deskAccessoryName); @@ -1338,10 +1719,10 @@ void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum ) else { wxWindow* frontwindow = wxFindWinFromMacWindow( ::FrontWindow() ) ; - if ( frontwindow && wxMenuBar::s_macInstalledMenuBar ) - wxMenuBar::s_macInstalledMenuBar->MacMenuSelect( frontwindow->GetEventHandler() , 0 , macMenuId , macMenuItemNum ) ; - } - HiliteMenu(0); + if ( frontwindow && wxMenuBar::MacGetInstalledMenuBar() ) + wxMenuBar::MacGetInstalledMenuBar()->MacMenuSelect( frontwindow->GetEventHandler() , 0 , macMenuId , macMenuItemNum ) ; + } + HiliteMenu(0); } /* @@ -1368,4 +1749,4 @@ wxApp::macAdjustCursor() } } } -*/ \ No newline at end of file +*/