X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/566d84a7c3c06956562b9f8ac364aa3bad760c10..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/scrolwin.h diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index ad017649b2..cf8854cf56 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -6,13 +6,13 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GTK_SCROLLWIN_H_ #define _WX_GTK_SCROLLWIN_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "scrolwin.h" #endif @@ -99,9 +99,6 @@ public: // Get the view start virtual void GetViewStart(int *x, int *y) const; - // Compatibility - void ViewStart(int *x, int *y) const - { GetViewStart( x, y ); } // translate between scrolled and unscrolled coordinates void CalcScrolledPosition(int x, int y, int *xx, int *yy) const @@ -121,7 +118,7 @@ public: DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y); return p2; } - + virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const; virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const; @@ -162,6 +159,11 @@ public: // Overridden from wxWindows due callback being static virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ); +#if WXWIN_COMPATIBILITY_2_2 + // Compatibility + void ViewStart(int *x, int *y) const { GetViewStart( x, y ); } +#endif // WXWIN_COMPATIBILITY_2_2 + protected: wxWindow *m_targetWindow; int m_xScrollPixelsPerLine;