X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/566d84a7c3c06956562b9f8ac364aa3bad760c10..0d1cb8cb298ae68754575cb65695ff9567a36899:/include/wx/generic/scrolwin.h diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index acf05c500b..3ce3d59e28 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -5,14 +5,14 @@ // 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_ #define _WX_GENERIC_SCROLLWIN_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "genscrolwin.h" #endif @@ -27,7 +27,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; // default scrolled window style #ifndef wxScrolledWindowStyle -#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL) + #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL) #endif // avoid triggering this stupid VC++ warning @@ -66,10 +66,21 @@ public: virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); } - // lay out the window and its children + // lay out the window and its children virtual bool Layout(); - virtual void DoSetVirtualSize( int x, int y ); + 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 @@ -94,4 +105,3 @@ private: #endif // _WX_GENERIC_SCROLLWIN_H_ -// vi:sts=4:sw=4:et