From b52acd035e751a1e9a8313c5987c2b67a5b55ca0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 17 Jun 2004 22:50:54 +0000 Subject: [PATCH] Use GetBackgroundColour so it will revert to the default if wxNullColour is used git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/window.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 9088d2f57a..35913c0d0c 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -918,17 +918,18 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col ) return false ; wxBrush brush ; - if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) + wxColour newCol(GetBackgroundColour()); + if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) { brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ; } - else if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) + else if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; } else { - brush.SetColour( col ) ; + brush.SetColour( newCol ) ; } MacSetBackgroundBrush( brush ) ; -- 2.47.2