From a14337d63f53e4823523bd13ba1d58dc1715ba7f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 29 Aug 2007 15:39:29 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/tbar95.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 7966a6cd19..4ed908d923 100644 --- 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) ) { -- 2.45.2