Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-01-14 22:23:01 +00:00
parent 050d159c4a
commit e3507dd851
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/latex/wx/toolbook.tex
View File

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

7
include/wx/toolbook.h
View File

@@ -26,11 +26,16 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING;
// Use wxButtonToolBar // Use wxButtonToolBar
#define wxBK_BUTTONBAR 0x0100 #define wxTBK_BUTTONBAR 0x0100
// Use wxTB_HORZ_LAYOUT style for the controlling toolbar // Use wxTB_HORZ_LAYOUT style for the controlling toolbar
#define wxTBK_HORZ_LAYOUT 0x8000 #define wxTBK_HORZ_LAYOUT 0x8000
// deprecated synonym, don't use
#if WXWIN_COMPATIBILITY_2_8
#define wxBK_BUTTONBAR wxTBK_BUTTONBAR
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxToolbook // wxToolbook
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/generic/propdlg.cpp
View File

@@ -151,7 +151,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
#if wxUSE_TOOLBOOK #if wxUSE_TOOLBOOK
#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK) 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 else
#endif #endif
if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)) if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))

2
src/generic/toolbkg.cpp
View File

@@ -99,7 +99,7 @@ bool wxToolbook::Create(wxWindow *parent,
// TODO: make more configurable // TODO: make more configurable
#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
if (style & wxBK_BUTTONBAR) if (style & wxTBK_BUTTONBAR)
{ {
m_bookctrl = new wxButtonToolBar m_bookctrl = new wxButtonToolBar
( (