X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd76d9633a4235abc1faa3175bc43bcf099aa3ca..2f4bebe8ff6cd3a19a186a423cd671f72951cb73:/samples/widgets/notebook.cpp diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index 68d6647d5d..736e43f8fb 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 // ---------------------------------------------------------------------------- @@ -93,6 +89,8 @@ public: NotebookWidgetsPage(wxNotebook *notebook, wxImageList *imaglist); virtual ~NotebookWidgetsPage(); + virtual wxControl *GetWidget() const { return m_notebook; } + protected: // event handlers void OnPageChanging(wxNotebookEvent& event); @@ -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