X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3957448a34ce9f4860051ba292b35ad70f8fb9db..0e974385f6ab66910ee42ca287fbf9ada2392dc1:/samples/notebook/notebook.h diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h index 4bb0005270..20862f7327 100644 --- a/samples/notebook/notebook.h +++ b/samples/notebook/notebook.h @@ -9,7 +9,31 @@ // License: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include "wx/notebook.h" +// this sample can be used to test both wxNotebook and wxListbook +//#define TEST_LISTBOOK + +#ifdef TEST_LISTBOOK + #include "wx/listbook.h" + + #define wxNotebook wxListbook + #define wxNotebookEvent wxListbookEvent + + #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED + #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING + #define EVT_NOTEBOOK_PAGE_CHANGED EVT_LISTBOOK_PAGE_CHANGED + #define EVT_NOTEBOOK_PAGE_CHANGING EVT_LISTBOOK_PAGE_CHANGING + + #undef wxNB_TOP + #define wxNB_TOP wxLB_TOP + #undef wxNB_BOTTOM + #define wxNB_BOTTOM wxLB_BOTTOM + #undef wxNB_LEFT + #define wxNB_LEFT wxLB_LEFT + #undef wxNB_RIGHT + #define wxNB_RIGHT wxLB_RIGHT +#else + #include "wx/notebook.h" +#endif // Define a new application class MyApp : public wxApp @@ -48,7 +72,7 @@ class MyFrame : public wxFrame { public: MyFrame(const wxString& title, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE); + const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE); virtual ~MyFrame(); @@ -106,7 +130,7 @@ private: wxBoxSizer *m_sizerTop; // Sizer for m_notebook - wxNotebookSizer *m_sizerNotebook; + wxBookCtrlSizer *m_sizerNotebook; wxImageList *m_imageList;