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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 7ea81edd1220c4816f01f5c85059e58ee453344a..14bbd5e762703cf599c1d28ad841bc572903939c 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -29,6 +29,7 @@
 
 #include "wx/datetime.h"
 #include "wx/image.h"
 
 #include "wx/datetime.h"
 #include "wx/image.h"

+#include "wx/bookctrl.h"

 
 #if wxUSE_COLOURDLG
     #include "wx/colordlg.h"
 
 #if wxUSE_COLOURDLG
     #include "wx/colordlg.h"

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 11e0e9e6e5a3ad9abec34cb9c321e0177ed44268..46f32f6da95eb083295df905d98f8373ccf21988 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -77,7 +77,7 @@ enum
 class ButtonWidgetsPage : public WidgetsPage
 {
 public:
 class ButtonWidgetsPage : public WidgetsPage
 {
 public:

-    ButtonWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    ButtonWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~ButtonWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_button; }
     virtual ~ButtonWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_button; }


@@ -139,7 +139,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"));
 
 
 IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"));
 

-ButtonWidgetsPage::ButtonWidgetsPage(wxBookCtrl *book,
+ButtonWidgetsPage::ButtonWidgetsPage(wxBookCtrlBase *book,

                                      wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                      wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp
index d0c53b5734891d2bd729bd8f24e297c5170593ca..aeaf200853dee79d7bc3711defd2930c23a63f9f 100644 (file)
--- a/samples/widgets/checkbox.cpp
+++ b/samples/widgets/checkbox.cpp
@@ -73,7 +73,7 @@ enum
 class CheckBoxWidgetsPage : public WidgetsPage
 {
 public:
 class CheckBoxWidgetsPage : public WidgetsPage
 {
 public:

-    CheckBoxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    CheckBoxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~CheckBoxWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_checkbox; }
     virtual ~CheckBoxWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_checkbox; }


@@ -149,7 +149,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(CheckBoxWidgetsPage, wxT("CheckBox"));
 
 
 IMPLEMENT_WIDGETS_PAGE(CheckBoxWidgetsPage, wxT("CheckBox"));
 

-CheckBoxWidgetsPage::CheckBoxWidgetsPage(wxBookCtrl *book,
+CheckBoxWidgetsPage::CheckBoxWidgetsPage(wxBookCtrlBase *book,

                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index c4efd25cfe838bb9c7c3ec33801a74a5a77a33a7..df409ff2a8754d9a4ba09e80d97f05f8e161c4d9 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -84,7 +84,7 @@ enum
 class ComboboxWidgetsPage : public WidgetsPage
 {
 public:
 class ComboboxWidgetsPage : public WidgetsPage
 {
 public:

-    ComboboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    ComboboxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

 
     virtual wxControl *GetWidget() const { return m_combobox; }
 
 
     virtual wxControl *GetWidget() const { return m_combobox; }
 


@@ -190,7 +190,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox"));
 
 
 IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox"));
 

-ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
+ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrlBase *book,

                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp
index 372d0817b7585a5c2f4468faeaeac84fe5b1909f..743592a7ba196328050239f189a61a7c15c685ee 100644 (file)
--- a/samples/widgets/gauge.cpp
+++ b/samples/widgets/gauge.cpp
@@ -71,7 +71,7 @@ enum
 class GaugeWidgetsPage : public WidgetsPage
 {
 public:
 class GaugeWidgetsPage : public WidgetsPage
 {
 public:

-    GaugeWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    GaugeWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~GaugeWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_gauge; }
     virtual ~GaugeWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_gauge; }


@@ -158,7 +158,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge"));
 
 
 IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge"));
 

-GaugeWidgetsPage::GaugeWidgetsPage(wxBookCtrl *book,
+GaugeWidgetsPage::GaugeWidgetsPage(wxBookCtrlBase *book,

                                    wxImageList *imaglist)
                  :WidgetsPage(book)
 {
                                    wxImageList *imaglist)
                  :WidgetsPage(book)
 {

diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index 9c83a9a4677c5a7ca19459ced9c3a0702789663f..24610b6f0cce6921ba62f059893ba13d431dd230 100644 (file)
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -76,7 +76,7 @@ enum
 class ListboxWidgetsPage : public WidgetsPage
 {
 public:
 class ListboxWidgetsPage : public WidgetsPage
 {
 public:

-    ListboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    ListboxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

 
     virtual wxControl *GetWidget() const { return m_lbox; }
 
 
     virtual wxControl *GetWidget() const { return m_lbox; }
 


@@ -194,7 +194,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(ListboxWidgetsPage, _T("Listbox"));
 
 
 IMPLEMENT_WIDGETS_PAGE(ListboxWidgetsPage, _T("Listbox"));
 

-ListboxWidgetsPage::ListboxWidgetsPage(wxBookCtrl *book,
+ListboxWidgetsPage::ListboxWidgetsPage(wxBookCtrlBase *book,

                                        wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                        wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 2d8c217cf7d2791eaaaea4e04c47247c8049925d..bbdc0cae8afccae640be56e05b00786d1223f136 100644 (file)
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -86,7 +86,7 @@ enum Orient
 class NotebookWidgetsPage : public WidgetsPage
 {
 public:
 class NotebookWidgetsPage : public WidgetsPage
 {
 public:

-    NotebookWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    NotebookWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~NotebookWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_notebook; }
     virtual ~NotebookWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_notebook; }


@@ -192,7 +192,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"));
 
 
 IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"));
 

-NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrl *book,
+NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrlBase *book,

                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index 44fd53b749f7e9e1f8b0b13373f282f281a33e8b..e72f49f06c305dbbdbde5333afc37508c63a7977 100644 (file)
--- 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:
 class RadioWidgetsPage : public WidgetsPage
 {
 public:

-    RadioWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    RadioWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~RadioWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_radio; }
     virtual ~RadioWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_radio; }


@@ -160,7 +160,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, _T("Radio"));
 
 
 IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, _T("Radio"));
 

-RadioWidgetsPage::RadioWidgetsPage(wxBookCtrl *book,
+RadioWidgetsPage::RadioWidgetsPage(wxBookCtrlBase *book,

                                    wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                    wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 1a60da7a0d16b47c95d3dbb4d31fe29f6bd0b1d5..748049a4efc9d6f74f925cd1a1ce545bf1270ee1 100644 (file)
--- a/samples/widgets/slider.cpp
+++ b/samples/widgets/slider.cpp
@@ -89,7 +89,7 @@ enum
 class SliderWidgetsPage : public WidgetsPage
 {
 public:
 class SliderWidgetsPage : public WidgetsPage
 {
 public:

-    SliderWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    SliderWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~SliderWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_slider; }
     virtual ~SliderWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_slider; }


@@ -199,7 +199,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"));
 
 
 IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"));
 

-SliderWidgetsPage::SliderWidgetsPage(wxBookCtrl *book,
+SliderWidgetsPage::SliderWidgetsPage(wxBookCtrlBase *book,

                                      wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                      wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index 96725bbce68e67d93a59e2f9f02d4790938658f4..c0fd377581faa4eb14ef9ec2c26c8e3422de9035 100644 (file)
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -73,7 +73,7 @@ enum
 class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:
 class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:

-    SpinBtnWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    SpinBtnWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~SpinBtnWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_spinbtn; }
     virtual ~SpinBtnWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_spinbtn; }


@@ -167,7 +167,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"));
 
 
 IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"));
 

-SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrl *book,
+SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrlBase *book,

                                        wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                        wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 63cfb0d58367634938c31d675d7f43707b5c6e61..496284b85c41d663e93b379418c4b27b422beeae 100644 (file)
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -139,7 +139,7 @@ END_EVENT_TABLE()
 class StaticWidgetsPage : public WidgetsPage
 {
 public:
 class StaticWidgetsPage : public WidgetsPage
 {
 public:

-    StaticWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    StaticWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~StaticWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_statText; }
     virtual ~StaticWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_statText; }


@@ -205,7 +205,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static"));
 
 
 IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static"));
 

-StaticWidgetsPage::StaticWidgetsPage(wxBookCtrl *book,
+StaticWidgetsPage::StaticWidgetsPage(wxBookCtrlBase *book,

                                      wxImageList *imaglist)
                   : WidgetsPage(book)
 {
                                      wxImageList *imaglist)
                   : WidgetsPage(book)
 {

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 02c94cdc0cbeacb4d2a66d4fa2a8c5667e455f8d..c3b4392181b59579093c3ffb4757934896b807ff 100644 (file)
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -132,7 +132,7 @@ class TextWidgetsPage : public WidgetsPage
 {
 public:
     // ctor(s) and dtor
 {
 public:
     // ctor(s) and dtor

-    TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    TextWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);

     virtual ~TextWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_text; }
     virtual ~TextWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_text; }


@@ -334,7 +334,7 @@ IMPLEMENT_WIDGETS_PAGE(TextWidgetsPage, _T("Text"));
 // TextWidgetsPage creation
 // ----------------------------------------------------------------------------
 
 // TextWidgetsPage creation
 // ----------------------------------------------------------------------------
 

-TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist)
+TextWidgetsPage::TextWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist)

                : WidgetsPage(book)
 {
     imaglist->Add(wxBitmap(text_xpm));
                : WidgetsPage(book)
 {
     imaglist->Add(wxBitmap(text_xpm));

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index d5758b005e2e7a6ec3a2b46d3484962621a7507b..d656113dd7415095849539bb8372cf217c971e87 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -125,7 +125,7 @@ private:
 #endif // USE_LOG
 
     // the book containing the test pages
 #endif // USE_LOG
 
     // the book containing the test pages

-    wxBookCtrl *m_book;
+    wxBookCtrlBase *m_book;

 
     // and the image list for it
     wxImageList *m_imaglist;
 
     // 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_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
     m_imaglist = (wxImageList *)NULL;
 
 #if wxUSE_MENUS


@@ -644,7 +644,7 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
 // WidgetsPage
 // ----------------------------------------------------------------------------
 
 // WidgetsPage
 // ----------------------------------------------------------------------------
 

-WidgetsPage::WidgetsPage(wxBookCtrl *book)
+WidgetsPage::WidgetsPage(wxBookCtrlBase *book)

            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 30160829e8183a4aef6ce844c9b0d1991972a1f4..0fb6e05b58d5a3bc76fcf7569745dcec7b206169 100644 (file)
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -13,7 +13,7 @@
 #define _WX_SAMPLE_WIDGETS_H_
 
 class WXDLLEXPORT wxCheckBox;
 #define _WX_SAMPLE_WIDGETS_H_
 
 class WXDLLEXPORT wxCheckBox;

-class WXDLLEXPORT wxBookCtrl;
+class WXDLLEXPORT wxBookCtrlBase;

 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxTextCtrl;
 
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxTextCtrl;
 


@@ -37,7 +37,7 @@ class WidgetsPageInfo;
 class WidgetsPage : public wxPanel
 {
 public:
 class WidgetsPage : public wxPanel
 {
 public:

-    WidgetsPage(wxBookCtrl *book);
+    WidgetsPage(wxBookCtrlBase *book);

 
     // return the control shown by this page
     virtual wxControl *GetWidget() const = 0;
 
     // return the control shown by this page
     virtual wxControl *GetWidget() const = 0;


@@ -83,7 +83,7 @@ public:
 class WidgetsPageInfo
 {
 public:
 class WidgetsPageInfo
 {
 public:

-    typedef WidgetsPage *(*Constructor)(wxBookCtrl *book,
+    typedef WidgetsPage *(*Constructor)(wxBookCtrlBase *book,

                                         wxImageList *imaglist);
 
     // our ctor
                                         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)                            \
 
 // 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::                                             \
                                       wxImageList *imaglist)                \
         { return new classname(book, imaglist); }                           \
     WidgetsPageInfo classname::                                             \