Extract compiler-specific macro definitions in a new wx/compiler.h.

[wxWidgets.git] / samples / notebook / notebook.h

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index bd3146ecaaddb4f10a3151ad5352c28bc364fc91..416e31918cdc4bc12e25535387bf4d47eafb224f 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -13,7 +13,9 @@
 #include "wx/listbook.h"
 #include "wx/treebook.h"
 #include "wx/notebook.h"
+#include "wx/simplebook.h"
 #include "wx/toolbook.h"
+#include "wx/aui/auibook.h"
 
 #if wxUSE_LOG && !defined( __SMARTPHONE__ )
     #define USE_LOG 1
@@ -40,7 +42,7 @@ public:
     void OnType(wxCommandEvent& event);
     void OnOrient(wxCommandEvent& event);
     void OnShowImages(wxCommandEvent& event);
-    void OnMulti(wxCommandEvent& event);
+    void OnStyle(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
 
     void OnAddPage(wxCommandEvent& event);
@@ -49,7 +51,10 @@ public:
     void OnDeleteCurPage(wxCommandEvent& event);
     void OnDeleteLastPage(wxCommandEvent& event);
     void OnNextPage(wxCommandEvent& event);
-    void OnGoHome(wxCommandEvent &event);
+    void OnChangeSelection(wxCommandEvent &event);
+    void OnSetSelection(wxCommandEvent &event);
+    void OnGetPageSize(wxCommandEvent &event);
+    void OnSetPageSize(wxCommandEvent &event);
 
     void OnAddSubPage(wxCommandEvent& event);
     void OnAddPageBefore(wxCommandEvent& event);
@@ -76,6 +81,9 @@ public:
 #if wxUSE_TOOLBOOK
     void OnToolbook(wxToolbookEvent& event) { OnBookCtrl(event); }
 #endif
+#if wxUSE_AUI
+    void OnAuiNotebook(wxAuiNotebookEvent& event) { OnBookCtrl(event); }
+#endif
 
     void OnIdle(wxIdleEvent& event);
 
@@ -90,7 +98,6 @@ private:
 
     void RecreateBook();
     wxPanel *CreateNewPage() const;
-    int TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbk) const;
     void AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, const wxChar * flagName) const;
 
     // Sample setup
@@ -101,11 +108,17 @@ private:
         Type_Choicebook,
         Type_Treebook,
         Type_Toolbook,
+        Type_AuiNotebook,
+        Type_Simplebook,
         Type_Max
     } m_type;
     int m_orient;
     bool m_chkShowImages;
+    bool m_fixedWidth;
     bool m_multi;
+    bool m_noPageTheme;
+    bool m_buttonBar;
+    bool m_horzLayout;
 
     // Controls
 
@@ -132,6 +145,8 @@ enum ID_COMMANDS
     ID_BOOK_CHOICEBOOK,
     ID_BOOK_TREEBOOK,
     ID_BOOK_TOOLBOOK,
+    ID_BOOK_AUINOTEBOOK,
+    ID_BOOK_SIMPLEBOOK,
     ID_BOOK_MAX,
 
     ID_ORIENT_DEFAULT,
@@ -141,7 +156,11 @@ enum ID_COMMANDS
     ID_ORIENT_RIGHT,
     ID_ORIENT_MAX,
     ID_SHOW_IMAGES,
+    ID_FIXEDWIDTH,
     ID_MULTI,
+    ID_NOPAGETHEME,
+    ID_BUTTONBAR,
+    ID_HORZ_LAYOUT,
     ID_ADD_PAGE,
     ID_ADD_PAGE_NO_SELECT,
     ID_INSERT_PAGE,
@@ -150,7 +169,10 @@ enum ID_COMMANDS
     ID_NEXT_PAGE,
     ID_ADD_PAGE_BEFORE,
     ID_ADD_SUB_PAGE,
-    ID_GO_HOME,
+    ID_CHANGE_SELECTION,
+    ID_SET_SELECTION,
+    ID_GET_PAGE_SIZE,
+    ID_SET_PAGE_SIZE,
 
 #if wxUSE_HELP
     ID_CONTEXT_HELP,