Compile corrections

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

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index 47acd803260e12862b35122c2558d899bf8c24f0..33fc7aa1f89eb31760e4bc0a2ce2a27f2e31fa6a 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -6,16 +6,12 @@
 // Created:     30.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Created:     30.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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


@@ -163,6 +173,9 @@ protected:
     // the event handlers
     void OnSize(wxSizeEvent& event);
     void OnScroll(wxScrollWinEvent& event);
     // the event handlers
     void OnSize(wxSizeEvent& event);
     void OnScroll(wxScrollWinEvent& event);

+#if wxUSE_MOUSEWHEEL
+    void OnMouseWheel(wxMouseEvent& event);
+#endif

 
     // find the index of the line we need to show at the top of the window such
     // that the last (fully or partially) visible line is the given one
 
     // find the index of the line we need to show at the top of the window such
     // that the last (fully or partially) visible line is the given one


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


@@ -193,6 +209,10 @@ private:
     // partly, visible one)
     size_t m_nVisible;
 
     // partly, visible one)
     size_t m_nVisible;
 

+    // accumulated mouse wheel rotation
+#if wxUSE_MOUSEWHEEL
+    int m_sumWheelRotation;
+#endif

 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxVScrolledWindow)
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxVScrolledWindow)