Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The toolbar background for some colour schemes cannot be determined

Browse Source 
(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
This commit is contained in:
Julian Smart
2007-08-29 15:39:29 +00:00
parent c9c13e7043
commit a14337d63f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/tbar95.cpp
View File

@@ -308,6 +308,15 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS); ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
#endif #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; return true;
} }
@@ -414,7 +423,7 @@ wxSize wxToolBar::DoGetBestSize() const
if (!(GetWindowStyle() & wxTB_NODIVIDER)) if (!(GetWindowStyle() & wxTB_NODIVIDER))
sizeBest.y += 2; sizeBest.y += 2;
sizeBest.y ++; sizeBest.y ++;
} }
CacheBestSize(sizeBest); CacheBestSize(sizeBest);
@@ -1780,7 +1789,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
// Necessary in case we use a no-paint-on-size // Necessary in case we use a no-paint-on-size
// style in the parent: the controls can disappear // style in the parent: the controls can disappear
control->Refresh(false); control->Refresh(false);
} }
if ( staticText && rectStaticText.Intersects(rectItem) ) if ( staticText && rectStaticText.Intersects(rectItem) )
{ {