Steps towards implementing native-style, non-top-level toolbars on Mac

by implementing a toolbar class that uses native buttons.
Ultimately this should allow wxToolbook and wxPropertySheetDialog
classes to look native, when we complete the button API improvements
to combine text, bitmaps and toggling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-04-14 09:15:10 +00:00
parent 44c930ebba
commit 64d3ed176d
16 changed files with 718 additions and 16 deletions

View File

@@ -27,6 +27,7 @@
#include "wx/imaglist.h"
#include "wx/sysopt.h"
#include "wx/toolbook.h"
#include "wx/generic/buttonbar.h"
// ----------------------------------------------------------------------------
// various wxWidgets macros
@@ -89,7 +90,21 @@ bool wxToolbook::Create(wxWindow *parent,
orient = wxTB_VERTICAL;
// TODO: make more configurable
m_bookctrl = new wxToolBar
if (style & wxBK_BUTTONBAR)
{
m_bookctrl = new wxButtonToolBar
(
this,
wxID_TOOLBOOKTOOLBAR,
wxDefaultPosition,
wxDefaultSize,
orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
);
}
else
{
m_bookctrl = new wxToolBar
(
this,
wxID_TOOLBOOKTOOLBAR,
@@ -97,6 +112,7 @@ bool wxToolbook::Create(wxWindow *parent,
wxDefaultSize,
orient | wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER
);
}
return true;
}