X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..b4e0b521e0878a495c570af3d68b40c82b4a92b3:/include/wx/listbook.h?ds=inline

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 824656b619..40e2976093 100644
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -6,7 +6,7 @@
 // Created:     19.08.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOOK_H_
@@ -39,26 +39,6 @@ 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
 // ----------------------------------------------------------------------------
@@ -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)
@@ -151,7 +133,7 @@ class WXDLLEXPORT wxListbookEvent : public wxBookCtrlEvent
 {
 public:
     wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                    int nSel = -1, int nOldSel = -1)
+                    int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
         : wxBookCtrlEvent(commandType, id, nSel, nOldSel)
     {
     }
@@ -169,7 +151,7 @@ typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&);
   DECLARE_EVENT_TABLE_ENTRY(                                                \
     wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,                                    \
     id,                                                                     \
-    -1,                                                                     \
+    wxID_ANY,                                                               \
     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ),  \
     NULL                                                                    \
   ),
@@ -178,7 +160,7 @@ typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&);
   DECLARE_EVENT_TABLE_ENTRY(                                                \
     wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,                                   \
     id,                                                                     \
-    -1,                                                                     \
+    wxID_ANY,                                                               \
     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxListbookEventFunction, &fn ),  \
     NULL                                                                    \
   ),