Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switching colors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-09-14 17:42:35 +00:00
parent ebb1c57f8e
commit 26af4dbd0a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mac/carbon/settings.cpp
View File

@@ -39,12 +39,14 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
switch ( index ) switch ( index )
{ {
case wxSYS_COLOUR_WINDOW:
resultColor = *wxWHITE ;
break ;
case wxSYS_COLOUR_SCROLLBAR : case wxSYS_COLOUR_SCROLLBAR :
case wxSYS_COLOUR_BACKGROUND: case wxSYS_COLOUR_BACKGROUND:
case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_ACTIVECAPTION:
case wxSYS_COLOUR_INACTIVECAPTION: case wxSYS_COLOUR_INACTIVECAPTION:
case wxSYS_COLOUR_MENU: case wxSYS_COLOUR_MENU:
case wxSYS_COLOUR_WINDOW:
case wxSYS_COLOUR_WINDOWFRAME: case wxSYS_COLOUR_WINDOWFRAME:
case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_ACTIVEBORDER:
case wxSYS_COLOUR_INACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER:
@@ -116,9 +118,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
break ; break ;
case wxSYS_COLOUR_INFOBK : case wxSYS_COLOUR_INFOBK :
case wxSYS_COLOUR_APPWORKSPACE:
resultColor = *wxWHITE ; resultColor = *wxWHITE ;
break ; break ;
case wxSYS_COLOUR_APPWORKSPACE:
resultColor = wxColor( 0x80, 0x80, 0x80 ); ;
break ;
case wxSYS_COLOUR_HOTLIGHT: case wxSYS_COLOUR_HOTLIGHT:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION: case wxSYS_COLOUR_GRADIENTACTIVECAPTION:

2
src/mac/carbon/window.cpp
View File

@@ -1199,7 +1199,7 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
wxBrush brush ; wxBrush brush ;
wxColour newCol(GetBackgroundColour()); wxColour newCol(GetBackgroundColour());
if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) ) if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) )
brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ; brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ) else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;