Tinderbox build fix for wxUnivGTK build.

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

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 0c77ffc14d4a89eae8f4820c32154bda653bbbdb..61f06d573176025837bbe8291b2ea04be20131d1 100644 (file)
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -16,25 +16,11 @@
 
 #if wxUSE_LISTBOOK
 
 
 #if wxUSE_LISTBOOK
 

-// this can be defined to put a static line as separator between the list
-// control and the page area; but I think it finally looks better without it so
-// it is not enabled by default
-#define wxUSE_LINE_IN_LISTBOOK 0
-
-#if !wxUSE_STATLINE
-    #undef wxUSE_LINE_IN_LISTBOOK
-    #define wxUSE_LINE_IN_LISTBOOK 0
-#endif
-

 #include "wx/bookctrl.h"
 
 class WXDLLEXPORT wxListView;
 class WXDLLEXPORT wxListEvent;
 
 #include "wx/bookctrl.h"
 
 class WXDLLEXPORT wxListView;
 class WXDLLEXPORT wxListEvent;
 

-#if wxUSE_LINE_IN_LISTBOOK
-class WXDLLEXPORT wxStaticLine;
-#endif // wxUSE_LINE_IN_LISTBOOK
-

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


@@ -82,33 +68,19 @@ public:
     virtual int SetSelection(size_t n);
     virtual void SetImageList(wxImageList *imageList);
 
     virtual int SetSelection(size_t n);
     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();
 
     virtual bool DeleteAllPages();
 

-    wxListView* GetListView() { return m_list; }
+    wxListView* GetListView() const { return (wxListView*)m_bookctrl; }

 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
     // get the size which the list control should have
 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
     // get the size which the list control should have

-    wxSize GetListSize() const;
-
-    // get the page area
-    wxRect GetPageRect() const;
+    virtual wxSize GetControllerSize() const;

 
     // event handlers
 
     // event handlers

-    void OnSize(wxSizeEvent& event);

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

-
-    // the list control we use for showing the pages index
-    wxListView *m_list;
-
-#if wxUSE_LINE_IN_LISTBOOK
-    // the line separating it from the page area
-    wxStaticLine *m_line;
-#endif // wxUSE_LINE_IN_LISTBOOK
+    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;


@@ -134,8 +106,15 @@ public:
     {
     }
 
     {
     }
 

+    wxListbookEvent(const wxListbookEvent& event)
+        : wxBookCtrlBaseEvent(event)
+    {
+    }
+
+    virtual wxEvent *Clone() const { return new wxListbookEvent(*this); }
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbookEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListbookEvent)

 };
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
 };
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;