Remove deprecated methods

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

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index fedd45ab559cb8f14944120b78d2529f7f05f953..13c86119326c2b54418f0a6f54087f3f2090a898 100644 (file)
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -18,8 +18,8 @@
 
 #include "wx/bookctrl.h"
 
 
 #include "wx/bookctrl.h"
 

-class WXDLLEXPORT wxListView;
-class WXDLLEXPORT wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxListView;
+class WXDLLIMPEXP_FWD_CORE 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;


@@ -36,7 +36,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
 // wxListbook
 // ----------------------------------------------------------------------------
 
 // wxListbook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListbook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase

 {
 public:
     wxListbook()
 {
 public:
     wxListbook()


@@ -65,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;


@@ -78,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();


@@ -90,9 +92,6 @@ 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;
-

     void UpdateSelectedPage(size_t newsel);
 
     wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
     void UpdateSelectedPage(size_t newsel);
 
     wxBookCtrlBaseEvent* CreatePageChangingEvent() const;


@@ -117,7 +116,7 @@ private:
 // listbook event class and related stuff
 // ----------------------------------------------------------------------------
 
 // listbook event class and related stuff
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListbookEvent : public wxBookCtrlBaseEvent
+class WXDLLIMPEXP_CORE wxListbookEvent : public wxBookCtrlBaseEvent

 {
 public:
     wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
 {
 public:
     wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,