X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..49a91764b57168d9f441578001b3206a7330ee70:/src/mac/app.cpp

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index c7c54a882c..d03b4244fd 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -95,25 +95,41 @@ bool wxApp::s_macSupportPCMenuShortcuts = true ;
 long wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 wxString wxApp::s_macHelpMenuTitleName = "&Help" ;
 
+#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( (AppleEvent*) event , reply) ;
 }
 
+#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( (AppleEvent*) event , reply ) ;
 }
 
+#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( (AppleEvent*) event , reply ) ;
 }
 
+#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( (AppleEvent*) event , reply) ;
@@ -334,34 +350,36 @@ bool wxApp::Initialize()
   // Mac-specific
 
   UMAInitToolbox( 4 ) ;
+  SetEventMask( everyEvent ) ;
 	UMAShowWatchCursor() ;
 
-#ifdef __UNIX__
-    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   AEHandleODoc ,
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
+    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerUPP(AEHandleODoc) ,
                            (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , AEHandleOApp ,
+    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) ,
                            (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  AEHandlePDoc ,
+    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  NewAEEventHandlerUPP(AEHandlePDoc) ,
                            (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , AEHandleQuit ,
+    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) ,
                            (long) wxTheApp , FALSE ) ;
 #else
 	AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerProc(AEHandleODoc) ,
-						   (long) wxTheApp , FALSE ) ;
+			       (long) wxTheApp , FALSE ) ;
 	AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerProc(AEHandleOApp) ,
-						   (long) wxTheApp , FALSE ) ;
+			       (long) wxTheApp , FALSE ) ;
 	AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  NewAEEventHandlerProc(AEHandlePDoc) ,
-						   (long) wxTheApp , FALSE ) ;
+			       (long) wxTheApp , FALSE ) ;
 	AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerProc(AEHandleQuit) ,
-						   (long) wxTheApp , FALSE ) ;
+			       (long) wxTheApp , FALSE ) ;
 #endif
 
 
 #ifndef __UNIX__
   // test the minimal configuration necessary
 
+	#if !TARGET_CARBON
 	long theSystem ;
-	long theMachine;
+	long theMachine; 
 
 	if (Gestalt(gestaltMachineType, &theMachine) != noErr)
 	{
@@ -379,7 +397,6 @@ bool wxApp::Initialize()
 	{
 		error = kMacSTROldSystem  ;
 	}
-	#if !TARGET_CARBON
 	else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
 	{
 		error = kMacSTRSmallSize;
@@ -442,6 +459,17 @@ bool wxApp::Initialize()
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();
 
+#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
+
   wxInitializeStockLists();
   wxInitializeStockObjects();
 
@@ -872,11 +900,13 @@ bool wxYield()
 #endif
     EventRecord event ;
 
-	long sleepTime = 0 ; //::GetCaretTime();
+	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() ;
@@ -937,7 +967,7 @@ void wxApp::MacDoOneEvent()
 {
   EventRecord event ;
 
-	long sleepTime = ::GetCaretTime();
+	long sleepTime = 1 ; // GetCaretTime() / 4 ;
 
 	if (WaitNextEvent(everyEvent, &event,sleepTime, s_macCursorRgn))
 	{
@@ -953,10 +983,11 @@ void wxApp::MacDoOneEvent()
 		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
 
+  DeletePendingObjects() ;
 	wxMacProcessNotifierAndPendingEvents() ;
 }
 
@@ -1034,6 +1065,8 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
 
 	short windowPart = ::FindWindow(ev->where, &window);
 	wxWindow* win = wxFindWinFromMacWindow( window ) ;
+    if ( wxPendingDelete.Member(win) )
+        return ;
 
 	BitMap screenBits;
 	GetQDGlobalsScreenBits( &screenBits );
@@ -1150,7 +1183,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
 					SetOrigin( 0 , 0 ) ;
 					SetPort( port ) ;
 				}
-				if ( window != frontWindow )
+				if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
 				{
 					if ( s_macIsInModalLoop )
 					{
@@ -1163,6 +1196,8 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
 					}
 					else
 					{
+						if ( win )
+							win->MacMouseDown( ev , windowPart ) ;
 						UMASelectWindow( window ) ;
 					}
 				}
@@ -1407,7 +1442,37 @@ void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
 
 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 )
@@ -1435,7 +1500,8 @@ void wxApp::MacHandleUpdateEvent( EventRecord *ev )
 	wxWindow * win = wxFindWinFromMacWindow( window ) ;
 	if ( win )
 	{
-		win->MacUpdate( ev ) ;
+        if ( !wxPendingDelete.Member(win) )
+			win->MacUpdate( ev ) ;
 	}
 	else
 	{