adjust so that mono bitmaps don't get an alpha channel

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

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index e194dbf5db04e89b3dfa31022d70225591223dd8..41d44068c868c27777c403f6c5ec43ba80634d05 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -48,10 +48,17 @@ public:
     void OnDeleteCurPage(wxCommandEvent& event);
     void OnDeleteLastPage(wxCommandEvent& event);
     void OnNextPage(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); }


@@ -83,6 +90,7 @@ private:
     void RecreateBook();
     wxPanel *CreateNewPage() const;
     int TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbk) const;
     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
     enum BookType
 
     // Sample setup
     enum BookType


@@ -139,7 +147,13 @@ enum ID_COMMANDS
     ID_DELETE_LAST_PAGE,
     ID_NEXT_PAGE,
     ID_ADD_PAGE_BEFORE,
     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

 };
 
 /*
 };
 
 /*