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

Always set the background colour for XP, for consistent toolbar backgrounds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-09-04 13:47:05 +00:00
parent 23a081d436
commit 4b5ac600de
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/tbar95.cpp
View File

@@ -308,6 +308,13 @@ 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
// Fix a bug on e.g. the Silver theme on WinXP where control backgrounds
// are incorrectly drawn, by forcing the background to a specific colour.
int majorVersion, minorVersion;
wxGetOsVersion(& majorVersion, & minorVersion);
if (majorVersion < 6)
SetBackgroundColour(GetBackgroundColour());
return true; return true;
} }
@@ -1000,8 +1007,6 @@ bool wxToolBar::Realize()
// Deal with the controls finally // Deal with the controls finally
// ------------------------------ // ------------------------------
bool hasControls = false;
// adjust the controls size to fit nicely in the toolbar // adjust the controls size to fit nicely in the toolbar
int y = 0; int y = 0;
size_t index = 0; size_t index = 0;
@@ -1033,8 +1038,6 @@ bool wxToolBar::Realize()
continue; continue;
} }
hasControls = true;
wxControl *control = tool->GetControl(); wxControl *control = tool->GetControl();
wxStaticText * const staticText = tool->GetStaticText(); wxStaticText * const staticText = tool->GetStaticText();
@@ -1175,13 +1178,6 @@ bool wxToolBar::Realize()
InvalidateBestSize(); InvalidateBestSize();
UpdateSize(); UpdateSize();
// Fix a bug on e.g. the Silver theme on WinXP where control backgrounds
// are incorrectly drawn, by forcing the background to a specific colour.
int majorVersion, minorVersion;
wxGetOsVersion(& majorVersion, & minorVersion);
if (majorVersion < 6 && hasControls && !UseBgCol())
SetBackgroundColour(GetBackgroundColour());
return true; return true;
} }