X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad684023c5dc11e07170e2a030eec9f9b493f650..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/generic/toolbkg.cpp?ds=sidebyside diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp index 3ba71c29ab..1693b3cfe2 100644 --- a/src/generic/toolbkg.cpp +++ b/src/generic/toolbkg.cpp @@ -87,14 +87,19 @@ bool wxToolbook::Create(wxWindow *parent, wxDefaultValidator, name) ) return false; - int orient = wxTB_HORIZONTAL; - if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0) - orient = wxTB_VERTICAL; + int tbFlags = wxTB_TEXT | wxTB_FLAT | wxBORDER_NONE; + if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0 ) + tbFlags |= wxTB_VERTICAL; + else + tbFlags |= wxTB_HORIZONTAL; + + if ( style & wxTBK_HORZ_LAYOUT ) + tbFlags |= wxTB_HORZ_LAYOUT; // TODO: make more configurable #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON - if (style & wxBK_BUTTONBAR) + if (style & wxTBK_BUTTONBAR) { m_bookctrl = new wxButtonToolBar ( @@ -102,7 +107,7 @@ bool wxToolbook::Create(wxWindow *parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, - orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER + tbFlags ); } else @@ -114,7 +119,7 @@ bool wxToolbook::Create(wxWindow *parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, - orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER + tbFlags | wxTB_NODIVIDER ); }