Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index 38f3a9a61576fd73b9ea2e9e2e1b9537972911f3..cc500db1a912b009cd869b1eccddc463d6171157 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     30.05.03
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     30.05.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_VSCROLL_H_
 #define _WX_VSCROLL_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VSCROLL_H_
 #define _WX_VSCROLL_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "vscroll.h"
 #endif
 
 #pragma interface "vscroll.h"
 #endif
 


@@ -95,10 +95,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.
 


@@ -163,6 +163,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


@@ -193,6 +196,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)