Committing menubar changes again after CVS trashed them.

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

diff --git a/samples/notebook/test.h b/samples/notebook/test.h
index dc40a2456497e52a14e1e09e8d386cdad7b64ea5..6690464ae10333f7ff2b583fa0033d789306396f 100644 (file)
--- a/samples/notebook/test.h
+++ b/samples/notebook/test.h
@@ -6,7 +6,7 @@
 // Created:     25/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include <wx/notebook.h>
@@ -15,16 +15,19 @@
 class MyApp: public wxApp
 {
 public:
-    bool OnInit(void);
-    void InitTabView(wxNotebook* notebook, wxWindow* window);
+    bool OnInit();
+    void InitTabView(wxNotebook* notebook, wxPanel* window);
 
     wxButton*   m_okButton;
     wxButton*   m_cancelButton;
-    wxButton*   m_addPageButton;
+    wxButton*   m_addPageButton, *m_insertPageButton;
+    wxButton*   m_nextPageButton;
 };
 
 DECLARE_APP(MyApp)
 
+#if USE_TABBED_DIALOG
+
 class MyDialog: public wxDialog
 {
 public:
@@ -33,14 +36,16 @@ public:
 
     void OnOK(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
-    void Init(void);
+    void Init();
 
 protected:
     wxNotebook* m_notebook;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
+#else // USE_TABBED_DIALOG
+
 class MyFrame: public wxFrame
 {
 public:
@@ -50,15 +55,22 @@ public:
     void OnOK(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void OnAddPage(wxCommandEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void Init(void);
+    void OnInsertPage(wxCommandEvent& event);
+    void OnNextPage(wxCommandEvent& event);
+    void OnDeletePage(wxCommandEvent& event);
+    void OnIdle(wxIdleEvent& event);
+
+    void Init();
+
 protected:
     wxNotebook*     m_notebook;
     wxPanel*        m_panel; // Panel containing notebook and OK/Cancel/Help
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
+#endif // USE_TABBED_DIALOG
+
 // File ids
 #define TEST_ABOUT          2
 
@@ -78,4 +90,7 @@ DECLARE_EVENT_TABLE()
 
 #define ID_NOTEBOOK         1000
 #define ID_ADD_PAGE         1200
+#define ID_DELETE_PAGE      1201
+#define ID_NEXT_PAGE        1202
+#define ID_INSERT_PAGE      1203