ignore the border flags for the toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -218,14 +218,17 @@ bool wxToolBar::Create(wxWindow *parent,
|
|||||||
long style,
|
long style,
|
||||||
const wxString& name)
|
const wxString& name)
|
||||||
{
|
{
|
||||||
|
// toolbars never have border, giving one to them results in broken
|
||||||
|
// appearance
|
||||||
|
style &= ~wxBORDER_MASK;
|
||||||
|
style |= wxBORDER_NONE;
|
||||||
|
|
||||||
// common initialisation
|
// common initialisation
|
||||||
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
|
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
// prepare flags
|
// prepare flags
|
||||||
DWORD msflags = 0; // WS_VISIBLE | WS_CHILD always included
|
DWORD msflags = 0; // WS_VISIBLE | WS_CHILD always included
|
||||||
if (style & wxBORDER)
|
|
||||||
msflags |= WS_BORDER;
|
|
||||||
|
|
||||||
if ( style & wxCLIP_SIBLINGS )
|
if ( style & wxCLIP_SIBLINGS )
|
||||||
msflags |= WS_CLIPSIBLINGS;
|
msflags |= WS_CLIPSIBLINGS;
|
||||||
|
Reference in New Issue
Block a user