Set solid colour for whole control, not pages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -296,6 +296,15 @@ bool wxNotebook::Create(wxWindow *parent,
|
|||||||
if ( !MSWCreateControl(className, wxEmptyString, pos, size) )
|
if ( !MSWCreateControl(className, wxEmptyString, pos, size) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if (HasFlag(wxNB_NOPAGETHEME) || (wxSystemOptions::HasOption(wxT("msw.notebook.themed-background")) &&
|
||||||
|
wxSystemOptions::GetOptionInt(wxT("msw.notebook.themed-background")) == 0))
|
||||||
|
{
|
||||||
|
wxColour col = GetThemeBackgroundColour();
|
||||||
|
if (col.Ok())
|
||||||
|
{
|
||||||
|
SetBackgroundColour(col);
|
||||||
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -683,16 +692,6 @@ bool wxNotebook::InsertPage(size_t nPage,
|
|||||||
|
|
||||||
InvalidateBestSize();
|
InvalidateBestSize();
|
||||||
|
|
||||||
if (HasFlag(wxNB_NOPAGETHEME) || (wxSystemOptions::HasOption(wxT("msw.notebook.themed-background")) &&
|
|
||||||
wxSystemOptions::GetOptionInt(wxT("msw.notebook.themed-background")) == 0))
|
|
||||||
{
|
|
||||||
wxColour col = GetThemeBackgroundColour();
|
|
||||||
if (col.Ok())
|
|
||||||
{
|
|
||||||
pPage->SetBackgroundColour(col);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user