X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bec721ec75946b7659e104b637a4d1f45bef0997..32e163aec19e1668699cbcd815629c8c98a3bc25:/src/mac/window.cpp

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index ce34604fa1..9d9fdb5cc6 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1072,6 +1072,16 @@ void wxWindowMac::MacPaintBorders( int left , int top )
     }
 }
 
+void wxWindowMac::RemoveChild( wxWindowBase *child )
+{
+    if ( child == m_hScrollBar )
+        m_hScrollBar = NULL ;
+    if ( child == m_vScrollBar )
+        m_vScrollBar = NULL ;
+      
+    wxWindowBase::RemoveChild( child ) ;
+}
+
 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
@@ -1407,6 +1417,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 
     event.m_x = x ;
     event.m_y = y ;
+    event.SetEventObject( this ) ;
     
     if ( wxBusyCursorCount == 0 )
     {