From e0d5d9af8b7816dc08cbc1297d96e9cf2e78b655 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 13 Apr 2006 18:24:38 +0000 Subject: [PATCH] All book controls shares wxBK_* flags [bug #1469980]. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/bookctrl.h | 2 +- src/generic/choicbkg.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index 653a186aaa..02ad3f6f5e 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -132,7 +132,7 @@ public: void SetControlMargin(int margin) { m_controlMargin = margin; } int GetControlMargin() const { return m_controlMargin; } - // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style + // returns true if we have wxBK_TOP or wxBK_BOTTOM style bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); } // set/get option to shrink to fit current page diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index 7ec5d753d0..e701dffdb8 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -98,10 +98,10 @@ wxChoicebook::Create(wxWindow *parent, ); wxSizer* mainSizer = new wxBoxSizer(IsVertical() ? wxVERTICAL : wxHORIZONTAL); - - if (style & wxCHB_RIGHT || style & wxCHB_BOTTOM) + + if (style & wxBK_RIGHT || style & wxBK_BOTTOM) mainSizer->Add(0, 0, 1, wxEXPAND, 0); - + m_controlSizer = new wxBoxSizer(IsVertical() ? wxHORIZONTAL : wxVERTICAL); m_controlSizer->Add(m_bookctrl, 1, (IsVertical() ? wxALIGN_CENTRE_VERTICAL : wxALIGN_CENTRE) |wxGROW, 0); mainSizer->Add(m_controlSizer, 0, wxGROW|wxALL, m_controlMargin); -- 2.45.2