fix sizing of extra control

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

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index 42bd6088affd4db7b55f5580de1b6faf4d3dde7e..2c1587215bff427dee06c7690af4cdac4415f939 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -13,6 +13,7 @@
 #include "wx/listbook.h"
 #include "wx/treebook.h"
 #include "wx/notebook.h"
 #include "wx/listbook.h"
 #include "wx/treebook.h"
 #include "wx/notebook.h"

+#include "wx/toolbook.h"

 
 #if wxUSE_LOG && !defined( __SMARTPHONE__ )
     #define USE_LOG 1
 
 #if wxUSE_LOG && !defined( __SMARTPHONE__ )
     #define USE_LOG 1


@@ -43,14 +44,22 @@ public:
     void OnExit(wxCommandEvent& event);
 
     void OnAddPage(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
 
     void OnAddPage(wxCommandEvent& event);

+    void OnAddPageNoSelect(wxCommandEvent& event);

     void OnInsertPage(wxCommandEvent& event);
     void OnDeleteCurPage(wxCommandEvent& event);
     void OnDeleteLastPage(wxCommandEvent& event);
     void OnNextPage(wxCommandEvent& event);
     void OnInsertPage(wxCommandEvent& event);
     void OnDeleteCurPage(wxCommandEvent& event);
     void OnDeleteLastPage(wxCommandEvent& event);
     void OnNextPage(wxCommandEvent& event);

+    void OnGoHome(wxCommandEvent &event);

 
     void OnAddSubPage(wxCommandEvent& event);
     void OnAddPageBefore(wxCommandEvent& event);
 
 
     void OnAddSubPage(wxCommandEvent& event);
     void OnAddPageBefore(wxCommandEvent& event);
 

+#if wxUSE_HELP
+    void OnContextHelp(wxCommandEvent& event);
+#endif // wxUSE_HELP
+
+    void OnHitTest(wxCommandEvent& event);
+

     void OnBookCtrl(wxBookCtrlBaseEvent& event);
 #if wxUSE_NOTEBOOK
     void OnNotebook(wxNotebookEvent& event) { OnBookCtrl(event); }
     void OnBookCtrl(wxBookCtrlBaseEvent& event);
 #if wxUSE_NOTEBOOK
     void OnNotebook(wxNotebookEvent& event) { OnBookCtrl(event); }


@@ -64,6 +73,9 @@ public:
 #if wxUSE_TREEBOOK
     void OnTreebook(wxTreebookEvent& event) { OnBookCtrl(event); }
 #endif
 #if wxUSE_TREEBOOK
     void OnTreebook(wxTreebookEvent& event) { OnBookCtrl(event); }
 #endif

+#if wxUSE_TOOLBOOK
+    void OnToolbook(wxToolbookEvent& event) { OnBookCtrl(event); }
+#endif

 
     void OnIdle(wxIdleEvent& event);
 
 
     void OnIdle(wxIdleEvent& event);
 


@@ -78,15 +90,17 @@ private:
 
     void RecreateBook();
     wxPanel *CreateNewPage() const;
 
     void RecreateBook();
     wxPanel *CreateNewPage() const;

-    int TranslateBookFlag(int nb, int lb, int chb, int tbk) 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
     enum BookType
     {
         Type_Notebook,
 
     // Sample setup
     enum BookType
     {
         Type_Notebook,

-        Type_Choicebook,

         Type_Listbook,
         Type_Listbook,

+        Type_Choicebook,

         Type_Treebook,
         Type_Treebook,

+        Type_Toolbook,

         Type_Max
     } m_type;
     int m_orient;
         Type_Max
     } m_type;
     int m_orient;


@@ -117,6 +131,7 @@ enum ID_COMMANDS
     ID_BOOK_LISTBOOK,
     ID_BOOK_CHOICEBOOK,
     ID_BOOK_TREEBOOK,
     ID_BOOK_LISTBOOK,
     ID_BOOK_CHOICEBOOK,
     ID_BOOK_TREEBOOK,

+    ID_BOOK_TOOLBOOK,

     ID_BOOK_MAX,
 
     ID_ORIENT_DEFAULT,
     ID_BOOK_MAX,
 
     ID_ORIENT_DEFAULT,


@@ -128,12 +143,19 @@ enum ID_COMMANDS
     ID_SHOW_IMAGES,
     ID_MULTI,
     ID_ADD_PAGE,
     ID_SHOW_IMAGES,
     ID_MULTI,
     ID_ADD_PAGE,

+    ID_ADD_PAGE_NO_SELECT,

     ID_INSERT_PAGE,
     ID_DELETE_CUR_PAGE,
     ID_DELETE_LAST_PAGE,
     ID_NEXT_PAGE,
     ID_ADD_PAGE_BEFORE,
     ID_INSERT_PAGE,
     ID_DELETE_CUR_PAGE,
     ID_DELETE_LAST_PAGE,
     ID_NEXT_PAGE,
     ID_ADD_PAGE_BEFORE,

-    ID_ADD_SUB_PAGE
+    ID_ADD_SUB_PAGE,
+    ID_GO_HOME,
+
+#if wxUSE_HELP
+    ID_CONTEXT_HELP,
+#endif // wxUSE_HELP
+    ID_HITTEST

 };
 
 /*
 };
 
 /*