corrected warnings and removed useless extern declaration

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 8cd9a947a13bc43ef280ce29d89431aa8d81745d..9d9fdb5cc6e1a2208b6bf25cb708a92df80dd327 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/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)
 // 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.m_x = x ;
     event.m_y = y ;

+    event.SetEventObject( this ) ;

     
     if ( wxBusyCursorCount == 0 )
     {
     
     if ( wxBusyCursorCount == 0 )
     {


@@ -1447,10 +1458,12 @@ void wxWindowMac::Update()
     if ( win )
     {
       win->MacUpdate( 0 ) ;
     if ( win )
     {
       win->MacUpdate( 0 ) ;

+#if TARGET_API_MAC_CARBON

         if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
         {
                 QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
         }
         if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
         {
                 QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
         }

+#endif

       }
 }
 
       }
 }