rename wxBK_BUTTONBAR to wxTBK_BUTTONBAR as it's wxToolBook-specific and documented it

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

diff --git a/docs/latex/wx/toolbook.tex b/docs/latex/wx/toolbook.tex
index dd6d93b0bda2432d66a957172c9a54f1a5976058..ec84f5c0ddbaf99b26c83ac8c699f2608f0d1cc2 100644 (file)
--- a/docs/latex/wx/toolbook.tex
+++ b/docs/latex/wx/toolbook.tex
@@ -41,13 +41,16 @@ wxBookCtrlBase (see \helpref{wxBookCtrl overview}{wxbookctrloverview})\\
 
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxBK\_DEFAULT}}{Choose the default location for the
-labels depending on the current platform (currently always the top).}
+\twocolitem{\windowstyle{wxTBK\_BUTTONBAR}}{Use wxButtonToolBar-based
+implementation under Mac OS (ignored under other platforms.)}
 \twocolitem{\windowstyle{wxTBK\_HORZ\_LAYOUT}}{Shows the text and the icons
 alongside, not vertically stacked (only implement under Windows and GTK 2
 platforms as it relies on \texttt{wxTB\_HORZ\_LAYOUT} flag support).}
 \end{twocollist}
 
+The common wxBookCtrl styles described in this control 
+\helpref{overview}{wxbookctrloverview} are also supported.
+
 \wxheading{See also}
 
 \helpref{wxBookCtrl}{wxbookctrloverview}, \helpref{wxNotebook}{wxnotebook}, \helpref{notebook sample}{samplenotebook}

diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h
index e54c2e6056d02a2b2fdaf693d8dfde39035a8cb4..a45d87815ddea54673db4862042b53e70f35eb6a 100644 (file)
--- a/include/wx/toolbook.h
+++ b/include/wx/toolbook.h
@@ -26,11 +26,16 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING;
 
 
 // Use wxButtonToolBar
-#define wxBK_BUTTONBAR            0x0100
+#define wxTBK_BUTTONBAR            0x0100
 
 // Use wxTB_HORZ_LAYOUT style for the controlling toolbar
 #define wxTBK_HORZ_LAYOUT          0x8000
 
+// deprecated synonym, don't use
+#if WXWIN_COMPATIBILITY_2_8
+    #define wxBK_BUTTONBAR wxTBK_BUTTONBAR
+#endif
+
 // ----------------------------------------------------------------------------
 // wxToolbook
 // ----------------------------------------------------------------------------

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 939ff9ee85deb1d1cc355314842dd31fc0ce2cd6..b61825d1f2670edd54b541a0b0e10d89e4753f34 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -151,7 +151,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 #if wxUSE_TOOLBOOK
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
     if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)
-        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxBK_BUTTONBAR );
+        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxTBK_BUTTONBAR );
     else
 #endif
     if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 960387ef0a8989805fe65e2dea9462580d5b53e7..1693b3cfe2d4586cb3b36b6bd0d8b54d8312ec9a 100644 (file)
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -99,7 +99,7 @@ bool wxToolbook::Create(wxWindow *parent,
     // TODO: make more configurable
 
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
-    if (style & wxBK_BUTTONBAR)
+    if (style & wxTBK_BUTTONBAR)
     {
         m_bookctrl = new wxButtonToolBar
                  (