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

fixed wxFrame background colour in wxUniv on ports without native wxSYS_COLOUR_APPWORKSPACE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-12-24 19:06:39 +00:00
parent ccea21ccf8
commit 9c6d8b7cdb
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/univ/colschem.h
View File

@@ -53,21 +53,24 @@ public:
SHADOW_HIGHLIGHT, SHADOW_HIGHLIGHT,
SHADOW_IN, SHADOW_IN,
SHADOW_OUT, SHADOW_OUT,
// the titlebar background colours for the normal and focused states // the titlebar background colours for the normal and focused states
TITLEBAR, TITLEBAR,
TITLEBAR_ACTIVE, TITLEBAR_ACTIVE,
// the titlebar text colours // the titlebar text colours
TITLEBAR_TEXT, TITLEBAR_TEXT,
TITLEBAR_ACTIVE_TEXT, TITLEBAR_ACTIVE_TEXT,
// the default gauge fill colour // the default gauge fill colour
GAUGE, GAUGE,
// desktop background colour (only used by framebuffer ports) // desktop background colour (only used by framebuffer ports)
DESKTOP, DESKTOP,
// wxFrame's background colour
FRAME,
MAX MAX
}; };

2
src/univ/colschem.cpp
View File

@@ -65,7 +65,7 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_CAPTIONTEXT */, wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_CAPTIONTEXT */,
wxColourScheme::MAX /* wxSYS_COLOUR_ACTIVEBORDER */, wxColourScheme::MAX /* wxSYS_COLOUR_ACTIVEBORDER */,
wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVEBORDER */, wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVEBORDER */,
wxColourScheme::MAX /* wxSYS_COLOUR_APPWORKSPACE */, wxColourScheme::FRAME /* wxSYS_COLOUR_APPWORKSPACE */,
wxColourScheme::HIGHLIGHT /* wxSYS_COLOUR_HIGHLIGHT */, wxColourScheme::HIGHLIGHT /* wxSYS_COLOUR_HIGHLIGHT */,
wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_HIGHLIGHTTEXT */, wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_HIGHLIGHTTEXT */,
wxColourScheme::CONTROL /* wxSYS_COLOUR_BTNFACE */, wxColourScheme::CONTROL /* wxSYS_COLOUR_BTNFACE */,

1
src/univ/themes/gtk.cpp
View File

@@ -679,6 +679,7 @@ wxColour wxGTKColourScheme::Get(wxGTKColourScheme::StdColour col) const
{ {
switch ( col ) switch ( col )
{ {
case FRAME:
case WINDOW: return *wxWHITE; case WINDOW: return *wxWHITE;
case SHADOW_DARK: return *wxBLACK; case SHADOW_DARK: return *wxBLACK;

1
src/univ/themes/mono.cpp
View File

@@ -600,6 +600,7 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const
case TITLEBAR_ACTIVE: case TITLEBAR_ACTIVE:
case HIGHLIGHT_TEXT: case HIGHLIGHT_TEXT:
case DESKTOP: case DESKTOP:
case FRAME:
return GetBg(); return GetBg();
case MAX: case MAX:

2
src/univ/themes/win32.cpp
View File

@@ -1283,6 +1283,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
case TITLEBAR_ACTIVE_TEXT: return wxColour(GetSysColor(COLOR_CAPTIONTEXT)); case TITLEBAR_ACTIVE_TEXT: return wxColour(GetSysColor(COLOR_CAPTIONTEXT));
case DESKTOP: return wxColour(0x808000); case DESKTOP: return wxColour(0x808000);
case FRAME: return wxColour(GetSysColor(COLOR_APPWORKSPACE));
#else // !__WXMSW__ #else // !__WXMSW__
// use the standard Windows colours elsewhere // use the standard Windows colours elsewhere
case WINDOW: return *wxWHITE; case WINDOW: return *wxWHITE;
@@ -1315,6 +1316,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
case TITLEBAR_ACTIVE_TEXT:return *wxWHITE; case TITLEBAR_ACTIVE_TEXT:return *wxWHITE;
case DESKTOP: return wxColour(0x808000); case DESKTOP: return wxColour(0x808000);
case FRAME: return wxColour(0x808080);
#endif // __WXMSW__ #endif // __WXMSW__
case GAUGE: return Get(HIGHLIGHT); case GAUGE: return Get(HIGHLIGHT);