Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index bd3146ecaaddb4f10a3151ad5352c28bc364fc91..4646e8766a52dae6f0aba3b40ffdb502af26b244 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -40,7 +40,7 @@ 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);


@@ -49,7 +49,8 @@ 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 OnChangeSelection(wxCommandEvent &event);
+    void OnSetSelection(wxCommandEvent &event);

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


@@ -105,7 +106,11 @@ private:
     } m_type;
     int m_orient;
     bool m_chkShowImages;
     } 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
 


@@ -141,7 +146,11 @@ 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_NO_SELECT,
     ID_INSERT_PAGE,
     ID_ADD_PAGE,
     ID_ADD_PAGE_NO_SELECT,
     ID_INSERT_PAGE,


@@ -150,7 +159,8 @@ enum ID_COMMANDS
     ID_NEXT_PAGE,
     ID_ADD_PAGE_BEFORE,
     ID_ADD_SUB_PAGE,
     ID_NEXT_PAGE,
     ID_ADD_PAGE_BEFORE,
     ID_ADD_SUB_PAGE,

-    ID_GO_HOME,
+    ID_CHANGE_SELECTION,
+    ID_SET_SELECTION,

 
 #if wxUSE_HELP
     ID_CONTEXT_HELP,
 
 #if wxUSE_HELP
     ID_CONTEXT_HELP,