workaround for not appearing vertical scrollbar in wxTE_RICH2 controls

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

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index 0a10dcbb2d85904e4ab8b1661c60852053e28c8c..4bb0005270751c60c8997e8da551c9fa5fe11f52 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -30,7 +30,17 @@ public:
 
     void CreateInitialPages();
 
 
     void CreateInitialPages();
 

+    wxPanel *CreatePage(const wxString& pageName);
+
+    wxPanel *CreateUserCreatedPage();
+

     int GetIconIndex() const;
     int GetIconIndex() const;

+
+private:
+    wxPanel *CreateInsertPage();
+    wxPanel *CreateRadioButtonsPage();
+    wxPanel *CreateVetoPage();
+    wxPanel *CreateBigButtonPage();

 };
 
 //
 };
 
 //


@@ -46,21 +56,21 @@ public:
     // a different orientation and optionally with images.
     void ReInitNotebook();
 
     // a different orientation and optionally with images.
     void ReInitNotebook();
 

-    void CreateImageList();
-

     void OnCheckOrRadioBox(wxCommandEvent& event);
 
     void OnButtonAddPage(wxCommandEvent& event);
     void OnButtonInsertPage(wxCommandEvent& event);
     void OnCheckOrRadioBox(wxCommandEvent& event);
 
     void OnButtonAddPage(wxCommandEvent& event);
     void OnButtonInsertPage(wxCommandEvent& event);

-    void OnButtonDeletePage(wxCommandEvent& event);
+    void OnButtonDeleteCurPage(wxCommandEvent& event);
+    void OnButtonDeleteLastPage(wxCommandEvent& event);

     void OnButtonNextPage(wxCommandEvent& event);
     void OnButtonNextPage(wxCommandEvent& event);

-

     void OnButtonExit(wxCommandEvent& event);
 
     void OnNotebook(wxNotebookEvent& event);
 
     void OnButtonExit(wxCommandEvent& event);
 
     void OnNotebook(wxNotebookEvent& event);
 

-    void OnIdle(wxIdleEvent& event);
+    void OnUpdateUIBtnDeleteCurPage(wxUpdateUIEvent& event);
+    void OnUpdateUIBtnDeleteLastPage(wxUpdateUIEvent& event);

 
 

+    void OnIdle(wxIdleEvent& event);

 
 private:
     wxLog *m_logTargetOld;
 
 private:
     wxLog *m_logTargetOld;


@@ -75,7 +85,8 @@ private:
 
     wxButton *m_btnAddPage;
     wxButton *m_btnInsertPage;
 
     wxButton *m_btnAddPage;
     wxButton *m_btnInsertPage;

-    wxButton *m_btnDeletePage;
+    wxButton *m_btnDeleteCurPage;
+    wxButton *m_btnDeleteLastPage;

     wxButton *m_btnNextPage;
     wxButton *m_btnExit;
 
     wxButton *m_btnNextPage;
     wxButton *m_btnExit;
 


@@ -108,7 +119,8 @@ enum ID_CONTROLS
     ID_CHK_SHOWIMAGES,
     ID_BTN_ADD_PAGE,
     ID_BTN_INSERT_PAGE,
     ID_CHK_SHOWIMAGES,
     ID_BTN_ADD_PAGE,
     ID_BTN_INSERT_PAGE,

-    ID_BTN_DELETE_PAGE,
+    ID_BTN_DELETE_CUR_PAGE,
+    ID_BTN_DELETE_LAST_PAGE,

     ID_BTN_NEXT_PAGE,
     ID_NOTEBOOK
 };
     ID_BTN_NEXT_PAGE,
     ID_NOTEBOOK
 };


@@ -122,3 +134,18 @@ enum ORIENT
     ORIENT_RIGHT,
     ORIENT_MAX
 };
     ORIENT_RIGHT,
     ORIENT_MAX
 };

+
+/*
+Name of each notebook page.
+Used as a label for a page, and used when cloning the notebook
+to decide what type of page it is.
+*/
+
+#define I_WAS_INSERTED_PAGE_NAME  wxT("Inserted")
+#define RADIOBUTTONS_PAGE_NAME wxT("Radiobuttons")
+#define VETO_PAGE_NAME wxT("Veto")
+#define MAXIMIZED_BUTTON_PAGE_NAME wxT("Maximized button")
+
+// Pages that can be added by the user
+#define INSERTED_PAGE_NAME wxT("Inserted ")
+#define ADDED_PAGE_NAME wxT("Added ")