add const synonyms for wxGridTableBase::GetNumberRows/Cols(), using const_cast<>...

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

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 1c4c5ae51342b18b16ca731bbe333f91efe186f7..a8abcce05259087532f3b32f78ca082f9e515e91 100644 (file)
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -5,52 +5,38 @@
 // Modified by:
 // Created:     19.08.03
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     19.08.03
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOOK_H_
 #define _WX_LISTBOOK_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOOK_H_
 #define _WX_LISTBOOK_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "listbook.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_LISTBOOK
 
 #include "wx/bookctrl.h"
 
 #include "wx/defs.h"
 
 #if wxUSE_LISTBOOK
 
 #include "wx/bookctrl.h"
 

-class WXDLLEXPORT wxListView;
-class WXDLLEXPORT wxListEvent;
-class WXDLLEXPORT wxStaticLine;;
+class WXDLLIMPEXP_FWD_CORE wxListView;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;

 
 

-// ----------------------------------------------------------------------------
-// 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,
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;

 
 

-    // the mask which can be used to extract the alignment from the style
-    wxLB_ALIGN_MASK = 0xf
-};
+// 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
 // ----------------------------------------------------------------------------
 

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

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


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


@@ -90,39 +77,44 @@ public:
                             const wxString& text,
                             bool bSelect = false,
                             int imageId = -1);
                             const wxString& text,
                             bool bSelect = false,
                             int imageId = -1);

-    virtual int SetSelection(size_t n);
+    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 void SetImageList(wxImageList *imageList);
 

-    // 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() const { return (wxListView*)m_bookctrl; }

 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 

-private:
-    // common part of all constructors
-    void Init();
-

     // get the size which the list control should have
     // get the size which the list control should have

-    wxSize GetListSize() const;
+    virtual wxSize GetControllerSize() const;

 
 

-    // get the page area
-    wxRect GetPageRect() const;
-
-    // event handlers
-    void OnSize(wxSizeEvent& event);
-    void OnListSelected(wxListEvent& event);
+    void UpdateSelectedPage(size_t newsel);

 
 

+    wxBookCtrlEvent* CreatePageChangingEvent() const;
+    void MakeChangedEvent(wxBookCtrlEvent &event);

 
 

-    // the list control we use for showing the pages index
-    wxListView *m_list;
+    // get flags for different list control modes
+    long GetListCtrlIconViewFlags() const;
+    long GetListCtrlReportViewFlags() const;

 
 

-    // the line separating it from the page area
-    wxStaticLine *m_line;
+    // event handlers
+    void OnListSelected(wxListEvent& event);
+    void OnSize(wxSizeEvent& event);

 
     // the currently selected page or wxNOT_FOUND if none
     int m_selection;
 
 
     // the currently selected page or wxNOT_FOUND if none
     int m_selection;
 

+private:
+    // common part of all constructors
+    void Init();
+
+    // this should be called when we need to be relaid out
+    void UpdateSize();
+

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook)


@@ -132,41 +124,18 @@ private:
 // listbook event class and related stuff
 // ----------------------------------------------------------------------------
 
 // listbook event class and related stuff
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListbookEvent : public wxBookCtrlEvent
-{
-public:
-    wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                    int nSel = -1, int nOldSel = -1)
-        : wxBookCtrlEvent(commandType, id, nSel, nOldSel)
-    {
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbookEvent)
-};
+// wxListbookEvent is obsolete and defined for compatibility only (notice that
+// we use #define and not typedef to also keep compatibility with the existing
+// code which forward declares it)
+#define wxListbookEvent wxBookCtrlEvent
+typedef wxBookCtrlEventFunction wxListbookEventFunction;
+#define wxListbookEventHandler(func) wxBookCtrlEventHandler(func)

 
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
+#define EVT_LISTBOOK_PAGE_CHANGED(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))

 
 

-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)(wxListbookEventFunction) &fn,  \
-    NULL                                                                    \
-  ),
-
-#define EVT_LISTBOOK_PAGE_CHANGING(id, fn)                                  \
-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,                                   \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxListbookEventFunction) &fn,  \
-    NULL                                                                    \
-  ),
+#define EVT_LISTBOOK_PAGE_CHANGING(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))

 
 #endif // wxUSE_LISTBOOK
 
 
 #endif // wxUSE_LISTBOOK