X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29e1398fa035b277569c4514deb622e9f1ddcf40..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/scrolwin.h diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index e65935be7a..c2fcbfd411 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -4,7 +4,6 @@ // Author: Robert Roebling // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,10 +17,12 @@ class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase { + typedef wxScrollHelperBase base_type; public: // default ctor doesn't do anything wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { } + // implement the base class methods virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos = 0, int yPos = 0, @@ -29,6 +30,11 @@ public: virtual void AdjustScrollbars(); protected: + virtual void DoScroll(int x, int y); + virtual void DoShowScrollbars(wxScrollbarVisibility horz, + wxScrollbarVisibility vert); + +private: // this does (each) half of AdjustScrollbars() work void DoAdjustScrollbar(GtkRange* range, int pixelsPerLine, @@ -64,13 +70,7 @@ protected: int pixelsPerLine, int *posOld); - // implement the base class methods - virtual void DoScroll(int x, int y); - virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert); - -private: - DECLARE_NO_COPY_CLASS(wxScrollHelper) + wxDECLARE_NO_COPY_CLASS(wxScrollHelper); }; #endif // _WX_GTK_SCROLLWIN_H_