X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0133d06b1a1dbb3bebc0ddb8cf2a7aa9d926a936..8b6e6947fc8fb946391740d66b140413eccb6b6c:/samples/toolbar/toolbar.cpp?ds=sidebyside diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 96be6becfb..c839ceee55 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -152,6 +152,8 @@ private: const int ID_TOOLBAR = 500; +static const long TOOLBAR_STYLE = wxNO_BORDER | wxTB_FLAT | wxTB_DOCKABLE; + enum { IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200, @@ -240,7 +242,7 @@ void MyFrame::RecreateToolbar() SetToolBar(NULL); - long style = wxNO_BORDER | wxTB_FLAT | wxTB_DOCKABLE; + long style = TOOLBAR_STYLE; style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL; toolBar = CreateToolBar(style, ID_TOOLBAR); @@ -465,7 +467,7 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) { m_tbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, - wxTB_VERTICAL); + TOOLBAR_STYLE | wxTB_VERTICAL); m_tbar->AddTool(wxID_HELP, wxBITMAP(help), wxNullBitmap, FALSE, NULL,