fixed wxFrame background colour in wxUniv on ports without native wxSYS_COLOUR_APPWOR...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h
index 446daa08852d9d3cff66cb944105e0a977e86c4d..451c0ed4b31bdcd6c2b5d6a5e7f4d2e07a9db7ca 100644 (file)
--- a/include/wx/univ/colschem.h
+++ b/include/wx/univ/colschem.h
@@ -53,21 +53,24 @@ public:
         SHADOW_HIGHLIGHT,
         SHADOW_IN,
         SHADOW_OUT,
         SHADOW_HIGHLIGHT,
         SHADOW_IN,
         SHADOW_OUT,

-        
+

         // the titlebar background colours for the normal and focused states
         TITLEBAR,
         TITLEBAR_ACTIVE,
         // the titlebar background colours for the normal and focused states
         TITLEBAR,
         TITLEBAR_ACTIVE,

-        
+

         // the titlebar text colours
         TITLEBAR_TEXT,
         TITLEBAR_ACTIVE_TEXT,
         // the titlebar text colours
         TITLEBAR_TEXT,
         TITLEBAR_ACTIVE_TEXT,

-        
+

         // the default gauge fill colour
         GAUGE,
 
         // desktop background colour (only used by framebuffer ports)
         DESKTOP,
 
         // the default gauge fill colour
         GAUGE,
 
         // desktop background colour (only used by framebuffer ports)
         DESKTOP,
 

+        // wxFrame's background colour
+        FRAME,
+

         MAX
     };
 
         MAX
     };
 

diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 074088a7ea3752e95dba11768ae387776a61f7d1..1408cd83775a08f3f4bcd21f088a546f061f490d 100644 (file)
--- 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::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 */,
         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 837923645fdf7722ca15c526bc26038e85681ea3..42fd5a4bf0960163ed12e27e583b8ee66607e226 100644 (file)
--- 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 )
     {
 {
     switch ( col )
     {

+        case FRAME:

         case WINDOW:            return *wxWHITE;
 
         case SHADOW_DARK:       return *wxBLACK;
         case WINDOW:            return *wxWHITE;
 
         case SHADOW_DARK:       return *wxBLACK;

diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp
index 3bf18d39b296e7de601ee1018a1a68c1c86ff106..3c6ef714baef3a2d91b8ba4069f8b9cd85c83a05 100644 (file)
--- 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 TITLEBAR_ACTIVE:
         case HIGHLIGHT_TEXT:
         case DESKTOP:

+        case FRAME:

             return GetBg();
 
         case MAX:
             return GetBg();
 
         case MAX:

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 42a2efdff65b3f86bdc3822a5a62d9cd1bc1a60b..ff621a2a4ddab721442c7139e703af481ffcf04f 100644 (file)
--- 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 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;
 #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 TITLEBAR_ACTIVE_TEXT:return *wxWHITE;
 
         case DESKTOP:           return wxColour(0x808000);

+        case FRAME:             return wxColour(0x808080);

 #endif // __WXMSW__
 
         case GAUGE:             return Get(HIGHLIGHT);
 #endif // __WXMSW__
 
         case GAUGE:             return Get(HIGHLIGHT);