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

enable non-top tabs workaround for Vista too (replaces patch 1724221)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-02 13:17:46 +00:00
parent 66160760e1
commit b013c97102
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/msw/notebook.cpp
View File

@@ -97,6 +97,20 @@ LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
#endif // USE_NOTEBOOK_ANTIFLICKER
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
static bool HasTroubleWithNonTopTabs()
{
const int verComCtl32 = wxApp::GetComCtl32Version();
// 600 is XP, 616 is Vista -- and both have a problem with tabs not on top
// (but don't just test for >= 600 as Microsoft might decide to fix it in
// later versions, who knows...)
return verComCtl32 >= 600 && verComCtl32 <= 616;
}
// ----------------------------------------------------------------------------
// event table
// ----------------------------------------------------------------------------
@@ -283,11 +297,11 @@ bool wxNotebook::Create(wxWindow *parent,
#endif
#if !wxUSE_UXTHEME
// ComCtl32 notebook tabs simply don't work unless they're on top if we have uxtheme, we can
// work around it later (after control creation), but if we don't have uxtheme, we have to clear
// those styles
const int verComCtl32 = wxApp::GetComCtl32Version();
if ( verComCtl32 == 600 )
// ComCtl32 notebook tabs simply don't work unless they're on top if we
// have uxtheme, we can work around it later (after control creation), but
// if we have been compiled without uxtheme support, we have to clear those
// styles
if ( HasTroubleWithNonTopTabs() )
{
style &= ~(wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT);
}
@@ -360,16 +374,16 @@ bool wxNotebook::Create(wxWindow *parent,
// comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the
// control is simply not rendered correctly), so we disable themes
// if possible, otherwise we simply clear the styles.
// It's probably not possible to have UXTHEME without ComCtl32 6 or better, but lets
// check it anyway.
const int verComCtl32 = wxApp::GetComCtl32Version();
if ( verComCtl32 == 600 )
if ( HasTroubleWithNonTopTabs() &&
(style & (wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT)) )
{
// check if we use themes at all -- if we don't, we're still okay
if ( wxUxThemeEngine::GetIfActive() && (style & (wxBK_BOTTOM|wxBK_LEFT|wxBK_RIGHT)))
if ( wxUxThemeEngine::GetIfActive() )
{
wxUxThemeEngine::GetIfActive()->SetWindowTheme((HWND)this->GetHandle(), L"", L"");
SetBackgroundColour(GetThemeBackgroundColour()); //correct the background color for the new non-themed control
wxUxThemeEngine::GetIfActive()->SetWindowTheme(GetHwnd(), L"", L"");
// correct the background color for the new non-themed control
SetBackgroundColour(GetThemeBackgroundColour());
}
}
#endif // wxUSE_UXTHEME