X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29e1398fa035b277569c4514deb622e9f1ddcf40..33f3e2b31ed781ba1446b49ec6d3e226c0a5c652:/include/wx/gtk/scrolwin.h diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index e65935be7a..dac8d76689 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -18,10 +18,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 +31,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 +71,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_