diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h index 446daa0885..451c0ed4b3 100644 --- a/include/wx/univ/colschem.h +++ b/include/wx/univ/colschem.h @@ -53,21 +53,24 @@ public: SHADOW_HIGHLIGHT, SHADOW_IN, SHADOW_OUT, - + // the titlebar background colours for the normal and focused states TITLEBAR, TITLEBAR_ACTIVE, - + // the titlebar text colours TITLEBAR_TEXT, TITLEBAR_ACTIVE_TEXT, - + // the default gauge fill colour GAUGE, // desktop background colour (only used by framebuffer ports) DESKTOP, + // wxFrame's background colour + FRAME, + MAX }; diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp index 074088a7ea..1408cd8377 100644 --- a/src/univ/colschem.cpp +++ b/src/univ/colschem.cpp @@ -65,7 +65,7 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index) wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_CAPTIONTEXT */, wxColourScheme::MAX /* wxSYS_COLOUR_ACTIVEBORDER */, wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVEBORDER */, - wxColourScheme::MAX /* wxSYS_COLOUR_APPWORKSPACE */, + wxColourScheme::FRAME /* wxSYS_COLOUR_APPWORKSPACE */, wxColourScheme::HIGHLIGHT /* wxSYS_COLOUR_HIGHLIGHT */, wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_HIGHLIGHTTEXT */, wxColourScheme::CONTROL /* wxSYS_COLOUR_BTNFACE */, diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 837923645f..42fd5a4bf0 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -679,6 +679,7 @@ wxColour wxGTKColourScheme::Get(wxGTKColourScheme::StdColour col) const { switch ( col ) { + case FRAME: case WINDOW: return *wxWHITE; case SHADOW_DARK: return *wxBLACK; diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp index 3bf18d39b2..3c6ef714ba 100644 --- a/src/univ/themes/mono.cpp +++ b/src/univ/themes/mono.cpp @@ -600,6 +600,7 @@ wxColour wxMonoColourScheme::Get(wxMonoColourScheme::StdColour col) const case TITLEBAR_ACTIVE: case HIGHLIGHT_TEXT: case DESKTOP: + case FRAME: return GetBg(); case MAX: diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index 42a2efdff6..ff621a2a4d 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -1283,6 +1283,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const case TITLEBAR_ACTIVE_TEXT: return wxColour(GetSysColor(COLOR_CAPTIONTEXT)); case DESKTOP: return wxColour(0x808000); + case FRAME: return wxColour(GetSysColor(COLOR_APPWORKSPACE)); #else // !__WXMSW__ // use the standard Windows colours elsewhere case WINDOW: return *wxWHITE; @@ -1315,6 +1316,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const case TITLEBAR_ACTIVE_TEXT:return *wxWHITE; case DESKTOP: return wxColour(0x808000); + case FRAME: return wxColour(0x808080); #endif // __WXMSW__ case GAUGE: return Get(HIGHLIGHT);