From 5378558e5ca2de455ba9749cc8a3044c6a93d1eb Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sun, 28 Aug 2005 08:54:56 +0000 Subject: [PATCH 1/1] No significant changes. Remove reliance on wx/bookctrl.h being included in wx/sizer.h. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dialogs/dialogs.cpp | 1 + samples/widgets/button.cpp | 4 ++-- samples/widgets/checkbox.cpp | 4 ++-- samples/widgets/combobox.cpp | 4 ++-- samples/widgets/gauge.cpp | 4 ++-- samples/widgets/listbox.cpp | 4 ++-- samples/widgets/notebook.cpp | 4 ++-- samples/widgets/radiobox.cpp | 4 ++-- samples/widgets/slider.cpp | 4 ++-- samples/widgets/spinbtn.cpp | 4 ++-- samples/widgets/static.cpp | 4 ++-- samples/widgets/textctrl.cpp | 4 ++-- samples/widgets/widgets.cpp | 6 +++--- samples/widgets/widgets.h | 8 ++++---- 14 files changed, 30 insertions(+), 29 deletions(-) diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 7ea81edd12..14bbd5e762 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -29,6 +29,7 @@ #include "wx/datetime.h" #include "wx/image.h" +#include "wx/bookctrl.h" #if wxUSE_COLOURDLG #include "wx/colordlg.h" diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index 11e0e9e6e5..46f32f6da9 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -77,7 +77,7 @@ enum class ButtonWidgetsPage : public WidgetsPage { public: - ButtonWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + ButtonWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~ButtonWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_button; } @@ -139,7 +139,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button")); -ButtonWidgetsPage::ButtonWidgetsPage(wxBookCtrl *book, +ButtonWidgetsPage::ButtonWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp index d0c53b5734..aeaf200853 100644 --- a/samples/widgets/checkbox.cpp +++ b/samples/widgets/checkbox.cpp @@ -73,7 +73,7 @@ enum class CheckBoxWidgetsPage : public WidgetsPage { public: - CheckBoxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + CheckBoxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~CheckBoxWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_checkbox; } @@ -149,7 +149,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(CheckBoxWidgetsPage, wxT("CheckBox")); -CheckBoxWidgetsPage::CheckBoxWidgetsPage(wxBookCtrl *book, +CheckBoxWidgetsPage::CheckBoxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp index c4efd25cfe..df409ff2a8 100644 --- a/samples/widgets/combobox.cpp +++ b/samples/widgets/combobox.cpp @@ -84,7 +84,7 @@ enum class ComboboxWidgetsPage : public WidgetsPage { public: - ComboboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + ComboboxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual wxControl *GetWidget() const { return m_combobox; } @@ -190,7 +190,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox")); -ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book, +ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp index 372d0817b7..743592a7ba 100644 --- a/samples/widgets/gauge.cpp +++ b/samples/widgets/gauge.cpp @@ -71,7 +71,7 @@ enum class GaugeWidgetsPage : public WidgetsPage { public: - GaugeWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + GaugeWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~GaugeWidgetsPage(); virtual wxControl *GetWidget() const { return m_gauge; } @@ -158,7 +158,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge")); -GaugeWidgetsPage::GaugeWidgetsPage(wxBookCtrl *book, +GaugeWidgetsPage::GaugeWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) :WidgetsPage(book) { diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp index 9c83a9a467..24610b6f0c 100644 --- a/samples/widgets/listbox.cpp +++ b/samples/widgets/listbox.cpp @@ -76,7 +76,7 @@ enum class ListboxWidgetsPage : public WidgetsPage { public: - ListboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + ListboxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual wxControl *GetWidget() const { return m_lbox; } @@ -194,7 +194,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(ListboxWidgetsPage, _T("Listbox")); -ListboxWidgetsPage::ListboxWidgetsPage(wxBookCtrl *book, +ListboxWidgetsPage::ListboxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index 2d8c217cf7..bbdc0cae8a 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -86,7 +86,7 @@ enum Orient class NotebookWidgetsPage : public WidgetsPage { public: - NotebookWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + NotebookWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~NotebookWidgetsPage(); virtual wxControl *GetWidget() const { return m_notebook; } @@ -192,7 +192,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook")); -NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrl *book, +NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp index 44fd53b749..e72f49f06c 100644 --- a/samples/widgets/radiobox.cpp +++ b/samples/widgets/radiobox.cpp @@ -80,7 +80,7 @@ static const unsigned int DEFAULT_MAJOR_DIM = 3; class RadioWidgetsPage : public WidgetsPage { public: - RadioWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + RadioWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~RadioWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_radio; } @@ -160,7 +160,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, _T("Radio")); -RadioWidgetsPage::RadioWidgetsPage(wxBookCtrl *book, +RadioWidgetsPage::RadioWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index 1a60da7a0d..748049a4ef 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -89,7 +89,7 @@ enum class SliderWidgetsPage : public WidgetsPage { public: - SliderWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + SliderWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~SliderWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_slider; } @@ -199,7 +199,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider")); -SliderWidgetsPage::SliderWidgetsPage(wxBookCtrl *book, +SliderWidgetsPage::SliderWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp index 96725bbce6..c0fd377581 100644 --- a/samples/widgets/spinbtn.cpp +++ b/samples/widgets/spinbtn.cpp @@ -73,7 +73,7 @@ enum class SpinBtnWidgetsPage : public WidgetsPage { public: - SpinBtnWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + SpinBtnWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~SpinBtnWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_spinbtn; } @@ -167,7 +167,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin")); -SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrl *book, +SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp index 63cfb0d583..496284b85c 100644 --- a/samples/widgets/static.cpp +++ b/samples/widgets/static.cpp @@ -139,7 +139,7 @@ END_EVENT_TABLE() class StaticWidgetsPage : public WidgetsPage { public: - StaticWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + StaticWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~StaticWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_statText; } @@ -205,7 +205,7 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static")); -StaticWidgetsPage::StaticWidgetsPage(wxBookCtrl *book, +StaticWidgetsPage::StaticWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp index 02c94cdc0c..c3b4392181 100644 --- a/samples/widgets/textctrl.cpp +++ b/samples/widgets/textctrl.cpp @@ -132,7 +132,7 @@ class TextWidgetsPage : public WidgetsPage { public: // ctor(s) and dtor - TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + TextWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~TextWidgetsPage(){}; virtual wxControl *GetWidget() const { return m_text; } @@ -334,7 +334,7 @@ IMPLEMENT_WIDGETS_PAGE(TextWidgetsPage, _T("Text")); // TextWidgetsPage creation // ---------------------------------------------------------------------------- -TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist) +TextWidgetsPage::TextWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) : WidgetsPage(book) { imaglist->Add(wxBitmap(text_xpm)); diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index d5758b005e..d656113dd7 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -125,7 +125,7 @@ private: #endif // USE_LOG // the book containing the test pages - wxBookCtrl *m_book; + wxBookCtrlBase *m_book; // and the image list for it wxImageList *m_imaglist; @@ -290,7 +290,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title) m_lboxLog = (wxListBox *)NULL; m_logTarget = (wxLog *)NULL; #endif // USE_LOG - m_book = (wxBookCtrl *)NULL; + m_book = (wxBookCtrlBase *)NULL; m_imaglist = (wxImageList *)NULL; #if wxUSE_MENUS @@ -644,7 +644,7 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label) // WidgetsPage // ---------------------------------------------------------------------------- -WidgetsPage::WidgetsPage(wxBookCtrl *book) +WidgetsPage::WidgetsPage(wxBookCtrlBase *book) : wxPanel(book, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE | diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h index 30160829e8..0fb6e05b58 100644 --- a/samples/widgets/widgets.h +++ b/samples/widgets/widgets.h @@ -13,7 +13,7 @@ #define _WX_SAMPLE_WIDGETS_H_ class WXDLLEXPORT wxCheckBox; -class WXDLLEXPORT wxBookCtrl; +class WXDLLEXPORT wxBookCtrlBase; class WXDLLEXPORT wxSizer; class WXDLLEXPORT wxTextCtrl; @@ -37,7 +37,7 @@ class WidgetsPageInfo; class WidgetsPage : public wxPanel { public: - WidgetsPage(wxBookCtrl *book); + WidgetsPage(wxBookCtrlBase *book); // return the control shown by this page virtual wxControl *GetWidget() const = 0; @@ -83,7 +83,7 @@ public: class WidgetsPageInfo { public: - typedef WidgetsPage *(*Constructor)(wxBookCtrl *book, + typedef WidgetsPage *(*Constructor)(wxBookCtrlBase *book, wxImageList *imaglist); // our ctor @@ -117,7 +117,7 @@ private: // and this one must be inserted somewhere in the source file #define IMPLEMENT_WIDGETS_PAGE(classname, label) \ - WidgetsPage *wxCtorFor##classname(wxBookCtrl *book, \ + WidgetsPage *wxCtorFor##classname(wxBookCtrlBase *book, \ wxImageList *imaglist) \ { return new classname(book, imaglist); } \ WidgetsPageInfo classname:: \ -- 2.47.2