X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6362d82b3ed82aa6795e4ad03160820f94c9e4d4..26dd7154d5b4ab79db3cf4a6dc07c6404e6e14d8:/include/wx/gtk/scrolwin.h diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index 7b4d75c00e..f95ef798e2 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -16,12 +16,13 @@ // wxScrolledWindow // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxScrollHelperNative : public wxScrollHelper +class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase { public: // default ctor doesn't do anything - wxScrollHelperNative(wxWindow *win) : wxScrollHelper(win) { } + 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,8 @@ 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(wxScrollHelperNative) + DECLARE_NO_COPY_CLASS(wxScrollHelper) }; #endif // _WX_GTK_SCROLLWIN_H_