From: Vadim Zeitlin Date: Tue, 18 Jun 2002 12:47:40 +0000 (+0000) Subject: added ViewStart() as synonym for GetViewStart() in WXWIN_COMPATIBILITY_2_2 mode X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0d6d6051d7ea6b5d693cd08efcb62b978169dfa4?ds=sidebyside added ViewStart() as synonym for GetViewStart() in WXWIN_COMPATIBILITY_2_2 mode git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index ad017649b2..e667b760e0 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -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; diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h index ad017649b2..e667b760e0 100644 --- a/include/wx/gtk1/scrolwin.h +++ b/include/wx/gtk1/scrolwin.h @@ -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; diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 8e12c38018..11ba4edb59 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -84,7 +84,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; @@ -139,6 +139,11 @@ public: // once it is fixed! void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); } +#if WXWIN_COMPATIBILITY_2_2 + // Compatibility only, don't use + void ViewStart(int *x, int *y) const { GetViewStart( x, y ); } +#endif // WXWIN_COMPATIBILITY_2_2 + protected: // get pointer to our scroll rect if we use it or NULL const wxRect *GetRect() const