Skip EVT_RIGHT_UP event in wxHtmlWindow if it wasn't handled.

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

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index 68b732e7b4db6251b7dde612f8e9a2b917c75c65..d0b48b4afb905568815d742ffe8950764b2ec0c2 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -6,7 +6,7 @@
 // Created:     25/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2002 wxWidgets team
 // Created:     25/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2002 wxWidgets team

-// License:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/choicebk.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/choicebk.h"


@@ -14,6 +14,7 @@
 #include "wx/treebook.h"
 #include "wx/notebook.h"
 #include "wx/toolbook.h"
 #include "wx/treebook.h"
 #include "wx/notebook.h"
 #include "wx/toolbook.h"

+#include "wx/aui/auibook.h"

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


@@ -40,14 +41,19 @@ public:
     void OnType(wxCommandEvent& event);
     void OnOrient(wxCommandEvent& event);
     void OnShowImages(wxCommandEvent& event);
     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);
     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 OnChangeSelection(wxCommandEvent &event);
+    void OnSetSelection(wxCommandEvent &event);
+    void OnGetPageSize(wxCommandEvent &event);
+    void OnSetPageSize(wxCommandEvent &event);

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


@@ -74,6 +80,9 @@ public:
 #if wxUSE_TOOLBOOK
     void OnToolbook(wxToolbookEvent& event) { OnBookCtrl(event); }
 #endif
 #if wxUSE_TOOLBOOK
     void OnToolbook(wxToolbookEvent& event) { OnBookCtrl(event); }
 #endif

+#if wxUSE_AUI
+    void OnAuiNotebook(wxAuiNotebookEvent& event) { OnBookCtrl(event); }
+#endif

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


@@ -88,7 +97,7 @@ private:
 
     void RecreateBook();
     wxPanel *CreateNewPage() const;
 
     void RecreateBook();
     wxPanel *CreateNewPage() const;

-    int TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbk) const;
+    int TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbkm, int aui) const;

     void AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, const wxChar * flagName) const;
 
     // Sample setup
     void AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, const wxChar * flagName) const;
 
     // Sample setup


@@ -99,11 +108,16 @@ private:
         Type_Choicebook,
         Type_Treebook,
         Type_Toolbook,
         Type_Choicebook,
         Type_Treebook,
         Type_Toolbook,

+        Type_AuiNotebook,

         Type_Max
     } m_type;
     int m_orient;
     bool m_chkShowImages;
         Type_Max
     } m_type;
     int m_orient;
     bool m_chkShowImages;

+    bool m_fixedWidth;

     bool m_multi;
     bool m_multi;

+    bool m_noPageTheme;
+    bool m_buttonBar;
+    bool m_horzLayout;

 
     // Controls
 
 
     // Controls
 


@@ -130,6 +144,7 @@ enum ID_COMMANDS
     ID_BOOK_CHOICEBOOK,
     ID_BOOK_TREEBOOK,
     ID_BOOK_TOOLBOOK,
     ID_BOOK_CHOICEBOOK,
     ID_BOOK_TREEBOOK,
     ID_BOOK_TOOLBOOK,

+    ID_BOOK_AUINOTEBOOK,

     ID_BOOK_MAX,
 
     ID_ORIENT_DEFAULT,
     ID_BOOK_MAX,
 
     ID_ORIENT_DEFAULT,


@@ -139,14 +154,23 @@ enum ID_COMMANDS
     ID_ORIENT_RIGHT,
     ID_ORIENT_MAX,
     ID_SHOW_IMAGES,
     ID_ORIENT_RIGHT,
     ID_ORIENT_MAX,
     ID_SHOW_IMAGES,

+    ID_FIXEDWIDTH,

     ID_MULTI,
     ID_MULTI,

+    ID_NOPAGETHEME,
+    ID_BUTTONBAR,
+    ID_HORZ_LAYOUT,

     ID_ADD_PAGE,
     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_ADD_SUB_PAGE,
     ID_INSERT_PAGE,
     ID_DELETE_CUR_PAGE,
     ID_DELETE_LAST_PAGE,
     ID_NEXT_PAGE,
     ID_ADD_PAGE_BEFORE,
     ID_ADD_SUB_PAGE,

+    ID_CHANGE_SELECTION,
+    ID_SET_SELECTION,
+    ID_GET_PAGE_SIZE,
+    ID_SET_PAGE_SIZE,

 
 #if wxUSE_HELP
     ID_CONTEXT_HELP,
 
 #if wxUSE_HELP
     ID_CONTEXT_HELP,


@@ -154,21 +178,22 @@ enum ID_COMMANDS
     ID_HITTEST
 };
 
     ID_HITTEST
 };
 

+

 /*
 /*

-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.
+    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")
+#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
 
 // Pages that can be added by the user

-#define INSERTED_PAGE_NAME wxT("Inserted ")
-#define ADDED_PAGE_NAME wxT("Added ")
-#define ADDED_PAGE_NAME_BEFORE wxT(" Inserted before ")
-#define ADDED_SUB_PAGE_NAME wxT(" Inserted sub-page ")
+#define INSERTED_PAGE_NAME              wxT("Inserted ")
+#define ADDED_PAGE_NAME                 wxT("Added ")
+#define ADDED_PAGE_NAME_BEFORE          wxT(" Inserted before ")
+#define ADDED_SUB_PAGE_NAME             wxT(" Inserted sub-page ")