X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..dcc7f39c441129ada419961c48128428a07ce72e:/include/wx/generic/scrolwin.h

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index e0336e1368..3ce3d59e28 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_SCROLLWIN_H_
@@ -71,6 +71,17 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
+#if WXWIN_COMPATIBILITY   
+     virtual void GetScrollUnitsPerPage(int *x_page, int *y_page) const;   
+     virtual void CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const;
+     // Need to do this otherwise the compiler gets confuced 
+     // between float and int calls to this function.
+     void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+        { wxScrollHelper::CalcScrolledPosition(x, y, xx, yy); }
+     wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
+        { return wxScrollHelper::CalcScrolledPosition(pt); }
+#endif // WXWIN_COMPATIBILITY
+
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()