wxMenu *sheet_menu = new wxMenu;
sheet_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Standard property sheet\tShift-Ctrl-P"));
sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, _T("&Toolbook sheet\tShift-Ctrl-T"));
+#ifdef __WXMAC__
sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, _T("Button &Toolbook sheet\tShift-Ctrl-U"));
+#endif
file_menu->Append(wxID_ANY, _T("&Property sheets"), sheet_menu);
#endif // USE_SETTINGS_DIALOG
#pragma hdrstop
#endif
-#if wxUSE_TOOLBAR && wxUSE_BMPBUTTON
+// Currently, only for Mac as a toolbar replacement.
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
#ifndef WX_PRECOMP
#include "wx/utils.h"
bookCtrl = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
#endif
#if wxUSE_TOOLBOOK
-#if wxUSE_TOOLBAR && wxUSE_BMPBUTTON
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)
bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxBK_BUTTONBAR );
else
#include "wx/imaglist.h"
#include "wx/sysopt.h"
#include "wx/toolbook.h"
+
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
#include "wx/generic/buttonbar.h"
+#endif
// ----------------------------------------------------------------------------
// various wxWidgets macros
// TODO: make more configurable
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
if (style & wxBK_BUTTONBAR)
{
m_bookctrl = new wxButtonToolBar
);
}
else
+#endif
{
m_bookctrl = new wxToolBar
(
wxID_TOOLBOOKTOOLBAR,
wxDefaultPosition,
wxDefaultSize,
- orient | wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER
+ orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
);
}