The toolbar background for some colour schemes cannot be determined

[wxWidgets.git] / src / msw / tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7966a6cd196f389d3f73cb1c0d42dd81a68b4332..4ed908d9231bdcbfa5d767b5150c073243bf23a3 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -308,6 +308,15 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
         ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
 #endif
 
+    // The toolbar background for some colour schemes cannot be determined
+    // (for example Silver). So set an explicit background colour to avoid parts of
+    // the background being painted wrongly.
+
+    int majorVersion, minorVersion;
+    wxGetOsVersion(& majorVersion, & minorVersion);
+    if (majorVersion < 6)
+        SetBackgroundColour(GetBackgroundColour());
+
     return true;
 }
 
@@ -414,7 +423,7 @@ wxSize wxToolBar::DoGetBestSize() const
         if (!(GetWindowStyle() & wxTB_NODIVIDER))
             sizeBest.y += 2;
         sizeBest.y ++;
-       }
+    }
 
     CacheBestSize(sizeBest);
 
@@ -1780,7 +1789,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                     // Necessary in case we use a no-paint-on-size
                     // style in the parent: the controls can disappear
                     control->Refresh(false);
-                               }
+                }
 
                 if ( staticText && rectStaticText.Intersects(rectItem) )
                 {