X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e181eae04877c1369a3ad01160f889ddc48971b..c4807c0a8fdce8c8a21f7296cc224c08297ca54b:/src/mac/carbon/window.cpp diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 0b6532ed84..ad5767ee5d 100644 --- 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(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 )