More style issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -511,10 +511,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
|
|||||||
|
|
||||||
if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
|
if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
|
||||||
treeStyle |= wxNO_BORDER;
|
treeStyle |= wxNO_BORDER;
|
||||||
|
else
|
||||||
|
treeStyle |= wxBORDER_SUNKEN;
|
||||||
|
|
||||||
long filterStyle = 0;
|
long filterStyle = 0;
|
||||||
if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
|
if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
|
||||||
filterStyle |= wxNO_BORDER;
|
filterStyle |= wxNO_BORDER;
|
||||||
|
else
|
||||||
|
filterStyle |= wxBORDER_SUNKEN;
|
||||||
|
|
||||||
m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle);
|
m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle);
|
||||||
|
|
||||||
|
@@ -305,11 +305,6 @@ bool wxListCtrl::Create(wxWindow *parent,
|
|||||||
DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
|
DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
|
||||||
LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS;
|
LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS;
|
||||||
|
|
||||||
if ( m_windowStyle & wxCLIP_SIBLINGS )
|
|
||||||
wstyle |= WS_CLIPSIBLINGS;
|
|
||||||
|
|
||||||
if ( wxStyleHasBorder(m_windowStyle) )
|
|
||||||
wstyle |= WS_BORDER;
|
|
||||||
m_baseStyle = wstyle;
|
m_baseStyle = wstyle;
|
||||||
|
|
||||||
if ( !DoCreateControl(x, y, width, height) )
|
if ( !DoCreateControl(x, y, width, height) )
|
||||||
|
Reference in New Issue
Block a user