Add virtual keyword where applicable.

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

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index bdbb29f206a349f2fccd2d47246a8203e57b3b85..33fc7aa1f89eb31760e4bc0a2ce2a27f2e31fa6a 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -12,10 +12,6 @@
 #ifndef _WX_VSCROLL_H_
 #define _WX_VSCROLL_H_
 
 #ifndef _WX_VSCROLL_H_
 #define _WX_VSCROLL_H_
 

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

 #include "wx/panel.h"           // base class
 
 // ----------------------------------------------------------------------------
 #include "wx/panel.h"           // base class
 
 // ----------------------------------------------------------------------------


@@ -95,10 +91,10 @@ public:
     virtual bool ScrollPages(int pages);
 
     // redraw the specified line
     virtual bool ScrollPages(int pages);
 
     // redraw the specified line

-    void RefreshLine(size_t line);
+    virtual void RefreshLine(size_t line);

 
     // redraw all lines in the specified range (inclusive)
 
     // redraw all lines in the specified range (inclusive)

-    void RefreshLines(size_t from, size_t to);
+    virtual void RefreshLines(size_t from, size_t to);

 
     // return the item at the specified (in physical coordinates) position or.
 
 
     // return the item at the specified (in physical coordinates) position or.
 


@@ -118,15 +114,29 @@ public:
     size_t GetLineCount() const { return m_lineMax; }
 
     // get the first currently visible line
     size_t GetLineCount() const { return m_lineMax; }
 
     // get the first currently visible line

-    size_t GetFirstVisibleLine() const { return m_lineFirst; }
+    size_t GetVisibleBegin() const { return m_lineFirst; }

 
 

-    // get the last currently visible line
-    size_t GetLastVisibleLine() const { return m_lineFirst + m_nVisible - 1; }
+    // get the first currently visible line
+    size_t GetVisibleEnd() const { return m_lineFirst + m_nVisible; }

 
     // is this line currently visible?
     bool IsVisible(size_t line) const
 
     // is this line currently visible?
     bool IsVisible(size_t line) const

-        { return line >= m_lineFirst && line <= GetLastVisibleLine(); }
+        { return line >= GetVisibleBegin() && line < GetVisibleEnd(); }
+

 
 

+    // this is the same as GetVisibleBegin(), exists to match
+    // GetLastVisibleLine() and for backwards compatibility only
+    size_t GetFirstVisibleLine() const { return m_lineFirst; }
+
+    // get the last currently visible line
+    //
+    // this function is unsafe as it returns (size_t)-1 (i.e. a huge positive
+    // number) if the control is empty, use GetVisibleEnd() instead, this one
+    // is kept for backwards compatibility
+    size_t GetLastVisibleLine() const { return GetVisibleEnd() - 1; }
+
+    // layout the children (including the sizer if needed)
+    virtual bool Layout();

 
 protected:
     // this function must be overridden in the derived class and it should
 
 protected:
     // this function must be overridden in the derived class and it should


@@ -178,6 +188,9 @@ protected:
     // update the thumb size shown by the scrollbar
     void UpdateScrollbar();
 
     // update the thumb size shown by the scrollbar
     void UpdateScrollbar();
 

+    // remove the scrollbar completely because we don't need it
+    void RemoveScrollbar();
+

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