use AllocExclusive

[wxWidgets.git] / include / wx / listbook.h

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index b62da59d47ebe748eb41808172ccd529f22cd83b..d6e110a219aaaa01288e273ec60398b6dfd6bef8 100644 (file)
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -24,6 +24,14 @@ class WXDLLEXPORT wxListEvent;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
 

+// wxListbook flags
+#define wxLB_DEFAULT          wxBK_DEFAULT
+#define wxLB_TOP              wxBK_TOP
+#define wxLB_BOTTOM           wxBK_BOTTOM
+#define wxLB_LEFT             wxBK_LEFT
+#define wxLB_RIGHT            wxBK_RIGHT
+#define wxLB_ALIGN_MASK       wxBK_ALIGN_MASK
+

 // ----------------------------------------------------------------------------
 // wxListbook
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxListbook
 // ----------------------------------------------------------------------------


@@ -57,6 +65,7 @@ public:
                 const wxString& name = wxEmptyString);
 
 
                 const wxString& name = wxEmptyString);
 
 

+    // overridden base class methods

     virtual int GetSelection() const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetSelection() const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;


@@ -70,6 +79,7 @@ public:
                             int imageId = -1);
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
                             int imageId = -1);
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }

+    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;

     virtual void SetImageList(wxImageList *imageList);
 
     virtual bool DeleteAllPages();
     virtual void SetImageList(wxImageList *imageList);
 
     virtual bool DeleteAllPages();


@@ -82,17 +92,10 @@ protected:
     // get the size which the list control should have
     virtual wxSize GetControllerSize() const;
 
     // get the size which the list control should have
     virtual wxSize GetControllerSize() const;
 

-    // return the page corresponding to the tab at the specified position
-    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
-
-    int DoSetSelection(size_t nPage, int flags = 0);
-

     void UpdateSelectedPage(size_t newsel);
 
     void UpdateSelectedPage(size_t newsel);
 

-    void MakeChangedEvent(wxBookCtrlBaseEvent &event)
-    {
-        event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
-    }
+    wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
+    void MakeChangedEvent(wxBookCtrlBaseEvent &event);

 
     // event handlers
     void OnListSelected(wxListEvent& event);
 
     // event handlers
     void OnListSelected(wxListEvent& event);