X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f81bfef98230aa9476af18a2fddff85db6471bb5..a5c1f8ca21e458661410d5019aea45134ccd0569:/src/mac/toplevel.cpp

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 01c1daca7f..66c28891ca 100644
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -401,64 +401,6 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 
-// Patch 531199 defined a window event handler, as follows.
-// TODO: merge the moving/sizing event handling with the event
-// handler above.
-#if 0
-static pascal OSStatus
-WindowHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* userData )
-{
-    Rect		bounds;
-    SInt16		height, width;
-    UInt32		attributes;
-    OSStatus	result = eventNotHandledErr;
-    
-    GetEventParameter( inEvent, kEventParamAttributes, typeUInt32, NULL, sizeof( UInt32 ), NULL, &attributes );
-    
-    if ((attributes & (kWindowBoundsChangeSizeChanged | kWindowBoundsChangeOriginChanged)) != 0)
-    {
-        // Extract the current bounds. This is the paramter you get to modify to
-        // alter the window position or size during a window resizing.
-        GetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof( bounds ), NULL, &bounds );
-        
-        wxRect rect;
-        rect.SetLeft(bounds.left);
-        rect.SetTop(bounds.top);
-        rect.SetRight(bounds.right);
-        rect.SetBottom(bounds.bottom);
-        
-        bool rc;
-        wxWindowMac *pWindow = (wxWindowMac*)userData;
-        if ((attributes & kWindowBoundsChangeSizeChanged) != 0) {
-            wxSizeEvent event(rect, pWindow->GetId());
-            event.SetEventObject(pWindow);
-            rc = pWindow->GetEventHandler()->ProcessEvent(event);
-            rect = event.GetRect();
-        }
-        else {
-            wxMoveEvent event(rect, pWindow->GetId());
-            event.SetEventObject(pWindow);
-            rc = pWindow->GetEventHandler()->ProcessEvent(event);
-            rect = event.GetRect();
-        }
-        
-        if (rc) {
-            bounds.left = rect.GetLeft();
-            bounds.top = rect.GetTop();
-            bounds.right = rect.GetRight();
-            bounds.bottom = rect.GetBottom();
-        }
-        
-        // Set the current bounds parameter to our adjusted bounds. Return
-        // noErr to indicate we handled this event.
-        SetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, sizeof( bounds ), &bounds );
-        result = noErr;
-    }
-    return result;
-}
-#endif
-    // WindowHandler
-
 #endif
 
 // ---------------------------------------------------------------------------
@@ -497,6 +439,7 @@ void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 // ----------------------------------------------------------------------------
 
 WXHWND wxTopLevelWindowMac::s_macWindowInUpdate = NULL;
+wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;
 
 void wxTopLevelWindowMac::Init()
 {
@@ -738,7 +681,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
-        GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
+        GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler);
 #endif
     m_macFocus = NULL ;
 
@@ -974,8 +917,21 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)
 
 #endif
 
+void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)
+{
+    if(s_macDeactivateWindow)
+    {
+        wxLogDebug("Doing delayed deactivation of %p",s_macDeactivateWindow);
+        s_macDeactivateWindow->MacActivate(timestamp, false);
+    }
+}
+
 void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
 {
+    wxLogDebug("TopLevel=%p::MacActivate",this);
+    if(s_macDeactivateWindow==this)
+        s_macDeactivateWindow=NULL;
+    MacDelayedDeactivation(timestamp);
     wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
     event.m_timeStamp = timestamp ;
     event.SetEventObject(this);