porting forward scrolling fix

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 0b6532ed843e156dbce1f661f7085cbc4231771a..ad5767ee5d8e83231df90bce8a8ad1addf71c9e3 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -190,7 +190,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
                 if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
                 {
-                    updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+                    HIShapeGetAsQDRgn( visRegion.GetWXHRGN(), updateRgn );
                 }
                 else
                 {
@@ -2041,17 +2041,22 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {
     if ( MacGetTopLevelWindow() == NULL )
         return ;
-
+/*
 #if TARGET_API_MAC_OSX
     if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
     {
-        event.Skip() ;
     }
     else
 #endif
+*/
+    if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )
     {
         event.GetDC()->Clear() ;
     }
+    else
+    {
+        event.Skip() ;
+    }
 }
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )