X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/listbook.h?ds=sidebyside

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 73244fc256..9414943190 100644
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -39,31 +39,11 @@ class WXDLLEXPORT wxListEvent;
 class WXDLLEXPORT wxStaticLine;
 #endif // wxUSE_LINE_IN_LISTBOOK
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// wxListbook styles
-enum
-{
-    // default alignment: left everywhere except Mac where it is top
-    wxLB_DEFAULT = 0,
-
-    // put the list control to the left/right/top/bottom of the page area
-    wxLB_TOP    = 0x1,
-    wxLB_BOTTOM = 0x2,
-    wxLB_LEFT   = 0x4,
-    wxLB_RIGHT  = 0x8,
-
-    // the mask which can be used to extract the alignment from the style
-    wxLB_ALIGN_MASK = 0xf
-};
-
 // ----------------------------------------------------------------------------
 // wxListbook
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxListbook : public wxBookCtrl
+class WXDLLEXPORT wxListbook : public wxBookCtrlBase
 {
 public:
     wxListbook()
@@ -109,13 +89,13 @@ public:
     // returns true if we have wxLB_TOP or wxLB_BOTTOM style
     bool IsVertical() const { return HasFlag(wxLB_BOTTOM | wxLB_TOP); }
 
+    virtual bool DeleteAllPages();
+
+    wxListView* GetListView() { return m_list; }
+
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
-private:
-    // common part of all constructors
-    void Init();
-
     // get the size which the list control should have
     wxSize GetListSize() const;
 
@@ -126,7 +106,6 @@ private:
     void OnSize(wxSizeEvent& event);
     void OnListSelected(wxListEvent& event);
 
-
     // the list control we use for showing the pages index
     wxListView *m_list;
 
@@ -138,6 +117,9 @@ private:
     // 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(wxListbook)
@@ -147,12 +129,12 @@ private:
 // listbook event class and related stuff
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxListbookEvent : public wxBookCtrlEvent
+class WXDLLEXPORT wxListbookEvent : public wxBookCtrlBaseEvent
 {
 public:
     wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                    int nSel = -1, int nOldSel = -1)
-        : wxBookCtrlEvent(commandType, id, nSel, nOldSel)
+                    int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
+        : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel)
     {
     }
 
@@ -165,23 +147,14 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
 
 typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&);
 
-#define EVT_LISTBOOK_PAGE_CHANGED(id, fn)                                   \
-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,                                    \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ),  \
-    NULL                                                                    \
-  ),
-
-#define EVT_LISTBOOK_PAGE_CHANGING(id, fn)                                  \
-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,                                   \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ),  \
-    NULL                                                                    \
-  ),
+#define wxListbookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxListbookEventFunction, &func)
+
+#define EVT_LISTBOOK_PAGE_CHANGED(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxListbookEventHandler(fn))
+
+#define EVT_LISTBOOK_PAGE_CHANGING(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxListbookEventHandler(fn))
 
 #endif // wxUSE_LISTBOOK