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

fixed wxNotebook bg colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-27 00:24:11 +00:00
parent 1bc3250868
commit aeddd5a582
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/notebook.cpp
View File

@@ -145,23 +145,22 @@ bool wxNotebook::Create(wxWindow *parent,
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE; return FALSE;
// colors and font parent->AddChild(this);
m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
m_foregroundColour = *wxBLACK;
// style // style
m_windowStyle = style | wxTAB_TRAVERSAL; m_windowStyle = style | wxTAB_TRAVERSAL;
long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS; long tabStyle = WS_TABSTOP | TCS_TABS;
if ( m_windowStyle & wxBORDER )
tabStyle |= WS_BORDER;
if ( m_windowStyle & wxCLIP_SIBLINGS ) if ( m_windowStyle & wxCLIP_SIBLINGS )
tabStyle |= WS_CLIPSIBLINGS; tabStyle |= WS_CLIPSIBLINGS;
if (m_windowStyle & wxCLIP_CHILDREN) if (m_windowStyle & wxCLIP_CHILDREN)
tabStyle |= WS_CLIPCHILDREN; tabStyle |= WS_CLIPCHILDREN;
if ( m_windowStyle & wxTC_MULTILINE ) if ( m_windowStyle & wxTC_MULTILINE )
tabStyle |= TCS_MULTILINE; tabStyle |= TCS_MULTILINE;
if ( m_windowStyle & wxBORDER )
tabStyle |= WS_BORDER;
if (m_windowStyle & wxNB_FIXEDWIDTH) if (m_windowStyle & wxNB_FIXEDWIDTH)
tabStyle |= TCS_FIXEDWIDTH ; tabStyle |= TCS_FIXEDWIDTH ;
if (m_windowStyle & wxNB_BOTTOM) if (m_windowStyle & wxNB_BOTTOM)
@@ -178,13 +177,7 @@ bool wxNotebook::Create(wxWindow *parent,
return FALSE; return FALSE;
} }
// Not all compilers recognise SetWindowFont SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));
::SendMessage(GetHwnd(), WM_SETFONT,
(WPARAM)::GetStockObject(DEFAULT_GUI_FONT), TRUE);
if ( parent != NULL )
parent->AddChild(this);
return TRUE; return TRUE;
} }