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

No significant changes. Remove reliance on wx/bookctrl.h being

Browse Source 
included in wx/sizer.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-08-28 08:54:56 +00:00
parent 17ec440be6
commit 5378558e5c
14 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/dialogs/dialogs.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/datetime.h" #include "wx/datetime.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/bookctrl.h"
#if wxUSE_COLOURDLG #if wxUSE_COLOURDLG
#include "wx/colordlg.h" #include "wx/colordlg.h"

4
samples/widgets/button.cpp
View File

@@ -77,7 +77,7 @@ enum
class ButtonWidgetsPage : public WidgetsPage class ButtonWidgetsPage : public WidgetsPage
{ {
public: public:
ButtonWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); ButtonWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~ButtonWidgetsPage(){}; virtual ~ButtonWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_button; } 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/checkbox.cpp
View File

@@ -73,7 +73,7 @@ enum
class CheckBoxWidgetsPage : public WidgetsPage class CheckBoxWidgetsPage : public WidgetsPage
{ {
public: public:
CheckBoxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); CheckBoxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~CheckBoxWidgetsPage(){}; virtual ~CheckBoxWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_checkbox; } 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/combobox.cpp
View File

@@ -84,7 +84,7 @@ enum
class ComboboxWidgetsPage : public WidgetsPage class ComboboxWidgetsPage : public WidgetsPage
{ {
public: 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/gauge.cpp
View File

@@ -71,7 +71,7 @@ enum
class GaugeWidgetsPage : public WidgetsPage class GaugeWidgetsPage : public WidgetsPage
{ {
public: public:
GaugeWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); GaugeWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~GaugeWidgetsPage(); virtual ~GaugeWidgetsPage();
virtual wxControl *GetWidget() const { return m_gauge; } 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) wxImageList *imaglist)
:WidgetsPage(book) :WidgetsPage(book)
{ {

4
samples/widgets/listbox.cpp
View File

@@ -76,7 +76,7 @@ enum
class ListboxWidgetsPage : public WidgetsPage class ListboxWidgetsPage : public WidgetsPage
{ {
public: 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/notebook.cpp
View File

@@ -86,7 +86,7 @@ enum Orient
class NotebookWidgetsPage : public WidgetsPage class NotebookWidgetsPage : public WidgetsPage
{ {
public: public:
NotebookWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); NotebookWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~NotebookWidgetsPage(); virtual ~NotebookWidgetsPage();
virtual wxControl *GetWidget() const { return m_notebook; } 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/radiobox.cpp
View File

@@ -80,7 +80,7 @@ static const unsigned int DEFAULT_MAJOR_DIM = 3;
class RadioWidgetsPage : public WidgetsPage class RadioWidgetsPage : public WidgetsPage
{ {
public: public:
RadioWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); RadioWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~RadioWidgetsPage(){}; virtual ~RadioWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_radio; } 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/slider.cpp
View File

@@ -89,7 +89,7 @@ enum
class SliderWidgetsPage : public WidgetsPage class SliderWidgetsPage : public WidgetsPage
{ {
public: public:
SliderWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); SliderWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~SliderWidgetsPage(){}; virtual ~SliderWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_slider; } 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/spinbtn.cpp
View File

@@ -73,7 +73,7 @@ enum
class SpinBtnWidgetsPage : public WidgetsPage class SpinBtnWidgetsPage : public WidgetsPage
{ {
public: public:
SpinBtnWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); SpinBtnWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~SpinBtnWidgetsPage(){}; virtual ~SpinBtnWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_spinbtn; } 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/static.cpp
View File

@@ -139,7 +139,7 @@ END_EVENT_TABLE()
class StaticWidgetsPage : public WidgetsPage class StaticWidgetsPage : public WidgetsPage
{ {
public: public:
StaticWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); StaticWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~StaticWidgetsPage(){}; virtual ~StaticWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_statText; } 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) wxImageList *imaglist)
: WidgetsPage(book) : WidgetsPage(book)
{ {

4
samples/widgets/textctrl.cpp
View File

@@ -132,7 +132,7 @@ class TextWidgetsPage : public WidgetsPage
{ {
public: public:
// ctor(s) and dtor // ctor(s) and dtor
TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); TextWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~TextWidgetsPage(){}; virtual ~TextWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_text; } 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) : WidgetsPage(book)
{ {
imaglist->Add(wxBitmap(text_xpm)); imaglist->Add(wxBitmap(text_xpm));

6
samples/widgets/widgets.cpp
View File

@@ -125,7 +125,7 @@ private:
#endif // USE_LOG #endif // USE_LOG
// the book containing the test pages // the book containing the test pages
wxBookCtrl *m_book; wxBookCtrlBase *m_book;
// and the image list for it // and the image list for it
wxImageList *m_imaglist; wxImageList *m_imaglist;
@@ -290,7 +290,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
m_lboxLog = (wxListBox *)NULL; m_lboxLog = (wxListBox *)NULL;
m_logTarget = (wxLog *)NULL; m_logTarget = (wxLog *)NULL;
#endif // USE_LOG #endif // USE_LOG
m_book = (wxBookCtrl *)NULL; m_book = (wxBookCtrlBase *)NULL;
m_imaglist = (wxImageList *)NULL; m_imaglist = (wxImageList *)NULL;
#if wxUSE_MENUS #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, : wxPanel(book, wxID_ANY,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxNO_FULL_REPAINT_ON_RESIZE | wxNO_FULL_REPAINT_ON_RESIZE |

8
samples/widgets/widgets.h
View File

@@ -13,7 +13,7 @@
#define _WX_SAMPLE_WIDGETS_H_ #define _WX_SAMPLE_WIDGETS_H_
class WXDLLEXPORT wxCheckBox; class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxBookCtrl; class WXDLLEXPORT wxBookCtrlBase;
class WXDLLEXPORT wxSizer; class WXDLLEXPORT wxSizer;
class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxTextCtrl;
@@ -37,7 +37,7 @@ class WidgetsPageInfo;
class WidgetsPage : public wxPanel class WidgetsPage : public wxPanel
{ {
public: public:
WidgetsPage(wxBookCtrl *book); WidgetsPage(wxBookCtrlBase *book);
// return the control shown by this page // return the control shown by this page
virtual wxControl *GetWidget() const = 0; virtual wxControl *GetWidget() const = 0;
@@ -83,7 +83,7 @@ public:
class WidgetsPageInfo class WidgetsPageInfo
{ {
public: public:
typedef WidgetsPage *(*Constructor)(wxBookCtrl *book, typedef WidgetsPage *(*Constructor)(wxBookCtrlBase *book,
wxImageList *imaglist); wxImageList *imaglist);
// our ctor // our ctor
@@ -117,7 +117,7 @@ private:
// and this one must be inserted somewhere in the source file // and this one must be inserted somewhere in the source file
#define IMPLEMENT_WIDGETS_PAGE(classname, label) \ #define IMPLEMENT_WIDGETS_PAGE(classname, label) \
WidgetsPage *wxCtorFor##classname(wxBookCtrl *book, \ WidgetsPage *wxCtorFor##classname(wxBookCtrlBase *book, \
wxImageList *imaglist) \ wxImageList *imaglist) \
{ return new classname(book, imaglist); } \ { return new classname(book, imaglist); } \
WidgetsPageInfo classname:: \ WidgetsPageInfo classname:: \