wxButtonToolBar only useful on Mac right now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index b29c7530f751a1e4c833f7a95af0e8c5cf922f76..8a7e4e8b6e297535d70e11cc6e7b7eeda860b22a 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -369,7 +369,9 @@ bool MyApp::OnInit()
     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
 

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index f6a261c0921748c4103a0e6ab8413950650364e7..47308b318940b274144cb7103333085fc8a49801 100644 (file)
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -25,7 +25,8 @@
     #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"

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 096758dcc4bd0e4601323f73e2ae9132501b5fa8..d3bda2d3f3d14c9b43a91630a47cfaeafd24e194 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -154,7 +154,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
         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

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index b2536e57aefdedd4eed96780fdaa8d5f4d8e0967..a88ea5fd9c5a63acd1232db28e2307871e6d456a 100644 (file)
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -27,7 +27,10 @@
 #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
@@ -91,6 +94,7 @@ bool wxToolbook::Create(wxWindow *parent,
 
     // TODO: make more configurable
     
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
     if (style & wxBK_BUTTONBAR)
     {
         m_bookctrl = new wxButtonToolBar
@@ -103,6 +107,7 @@ bool wxToolbook::Create(wxWindow *parent,
                  );
     }
     else
+#endif
     {
         m_bookctrl = new wxToolBar
                  (
@@ -110,7 +115,7 @@ bool wxToolbook::Create(wxWindow *parent,
                     wxID_TOOLBOOKTOOLBAR,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    orient | wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER
+                    orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
                  );
     }