X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/generic/scrolwin.h?ds=sidebyside

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 85cd9e8e06..73ba89b9bc 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_SCROLLWIN_H_
 #define _WX_GENERIC_SCROLLWIN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "genscrolwin.h"
 #endif
 
@@ -71,17 +71,6 @@ 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()