X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd76d9633a4235abc1faa3175bc43bcf099aa3ca..4f31d61012bfa8371e268e42857f2d47f77c0af6:/samples/widgets/notebook.cpp diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index 68d6647d5d..bbdc0cae8a 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_NOTEBOOK + // for all others, include the necessary headers #ifndef WX_PRECOMP #include "wx/app.h" @@ -44,7 +46,6 @@ #include "wx/artprov.h" #include "widgets.h" -#if 1 #include "icons/notebook.xpm" // ---------------------------------------------------------------------------- @@ -78,11 +79,6 @@ enum Orient Orient_Max }; -// old versions of wxWidgets don't define this style -#ifndef wxNB_TOP - #define wxNB_TOP (0) -#endif - // ---------------------------------------------------------------------------- // NotebookWidgetsPage // ---------------------------------------------------------------------------- @@ -90,9 +86,11 @@ enum Orient class NotebookWidgetsPage : public WidgetsPage { public: - NotebookWidgetsPage(wxNotebook *notebook, wxImageList *imaglist); + NotebookWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); virtual ~NotebookWidgetsPage(); + virtual wxControl *GetWidget() const { return m_notebook; } + protected: // event handlers void OnPageChanging(wxNotebookEvent& event); @@ -194,9 +192,9 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook")); -NotebookWidgetsPage::NotebookWidgetsPage(wxNotebook *notebook, +NotebookWidgetsPage::NotebookWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist) - : WidgetsPage(notebook) + : WidgetsPage(book) { imaglist->Add(wxBitmap(notebook_xpm)); @@ -393,7 +391,7 @@ void NotebookWidgetsPage::CreateNotebook() m_notebook->AddPage(CreateNewPage(), old_note->GetPageText(n), false, - m_chkImages->GetValue() ? + m_chkImages->GetValue() ? GetIconIndex() : -1); } @@ -546,4 +544,4 @@ void NotebookWidgetsPage::OnPageChanged(wxNotebookEvent& event) event.Skip(); } -#endif +#endif // wxUSE_NOTEBOOK