Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / src / mac / window.cpp

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 8cd9a947a13bc43ef280ce29d89431aa8d81745d..fd36642550f9751c6951f1ce355407c378a3077a 100644 (file)
--- 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)
@@ -1447,10 +1457,12 @@ void wxWindowMac::Update()
     if ( win )
     {
       win->MacUpdate( 0 ) ;
+#if TARGET_API_MAC_CARBON
         if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
         {
                 QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
         }
+#endif
       }
 }