tab drawing fix for vista

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

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 51b7602b2a5223b50d2c698f47180b6ed09d25dc..deb7b9175fe4da973f5d9decd1c5ae645f2aca2f 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -193,6 +193,15 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
     wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
 
+    // the base_colour is too pale to use as our base colour,
+    // so darken it a bit --
+    if ((255-base_colour.Red()) +
+        (255-base_colour.Green()) +
+        (255-base_colour.Blue()) < 60)
+    {
+        base_colour = wxAuiStepColour(base_colour, 92);
+    }
+    
     m_base_colour = base_colour;
     wxColor border_colour = wxAuiStepColour(base_colour, 75);
 

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 44c84e3b498eb163af30f4fdf78b4eb7a2559ce1..9fbcddae2e62ba06d59d42a29581bc94b1a95cd7 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -207,6 +207,15 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
     wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
 
+    // the base_colour is too pale to use as our base colour,
+    // so darken it a bit --
+    if ((255-base_colour.Red()) +
+        (255-base_colour.Green()) +
+        (255-base_colour.Blue()) < 60)
+    {
+        base_colour = wxAuiStepColour(base_colour, 92);
+    }
+    
     m_base_colour = base_colour;
     wxColor darker1_colour = wxAuiStepColour(base_colour, 85);
     wxColor darker2_colour = wxAuiStepColour(base_colour, 75);