avoid bitmap distortion when a non standard bitmap size is used (replaces patch 1477883)

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 1a23e540470b709213ef0fbf1ab7301453ec0dd4..975404ea78360fbc0f548de3f52c6b5124eaec2a 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -201,7 +201,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 RgnHandle updateRgn = NULL ;
                 RgnHandle allocatedRgn = NULL ;
                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
                 RgnHandle updateRgn = NULL ;
                 RgnHandle allocatedRgn = NULL ;
                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;

-                Rect controlBounds ;

 
                 if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
                 {
 
                 if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
                 {


@@ -1200,7 +1199,7 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());
 
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());
 

-    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) )
+    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) )

         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
     else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
     else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;


@@ -3436,4 +3435,4 @@ bool wxWindowMac::CanSetTransparent()
 wxByte wxWindowMac::GetTransparent() const 
 {
     return m_macAlpha ;
 wxByte wxWindowMac::GetTransparent() const 
 {
     return m_macAlpha ;

-}
\ No newline at end of file
+}