X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5e0b4bc7c729ff41e66fb7894fb1387f860bdb2..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/choicebk.h?ds=inline

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 17f50bdc8d..4423d095f6 100644
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -24,31 +24,11 @@
 
 class WXDLLEXPORT wxChoice;
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// wxChoicebook styles
-enum
-{
-    // default alignment: top everywhere
-    wxCHB_DEFAULT = 0,
-
-    // put the choice control to the left/right/top/bottom of the page area
-    wxCHB_TOP    = 0x1,
-    wxCHB_BOTTOM = 0x2,
-    wxCHB_LEFT   = 0x4,
-    wxCHB_RIGHT  = 0x8,
-
-    // the mask which can be used to extract the alignment from the style
-    wxCHB_ALIGN_MASK = 0xf
-};
-
 // ----------------------------------------------------------------------------
 // wxChoicebook
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoicebook : public wxBookCtrl
+class WXDLLEXPORT wxChoicebook : public wxBookCtrlBase
 {
 public:
     wxChoicebook()
@@ -96,13 +76,12 @@ public:
 
     virtual bool DeleteAllPages();
 
+    // returns the choice control
+    wxChoice* GetChoiceCtrl() const { return m_choice; }
+
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
-private:
-    // common part of all constructors
-    void Init();
-
     // get the size which the choice control should have
     wxSize GetChoiceSize() const;
 
@@ -113,13 +92,15 @@ private:
     void OnSize(wxSizeEvent& event);
     void OnChoiceSelected(wxCommandEvent& event);
 
-
     // the choice control we use for showing the pages index
     wxChoice *m_choice;
 
     // the currently selected page or wxNOT_FOUND if none
     int m_selection;
 
+private:
+    // common part of all constructors
+    void Init();
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)
@@ -129,12 +110,12 @@ private:
 // choicebook event class and related stuff
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlEvent
+class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlBaseEvent
 {
 public:
     wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
                       int nSel = -1, int nOldSel = -1)
-        : wxBookCtrlEvent(commandType, id, nSel, nOldSel)
+        : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel)
     {
     }
 
@@ -147,23 +128,14 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
 
 typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
 
-#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn)                                 \
-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,                                  \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
-    NULL                                                                    \
-  ),
-
-#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)                                \
-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,                                   \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
-    NULL                                                                    \
-  ),
+#define wxChoicebookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func)
+
+#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn))
+
+#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn))
 
 #endif // wxUSE_CHOICEBOOK