X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..26dd7154d5b4ab79db3cf4a6dc07c6404e6e14d8:/include/wx/gtk/scrolwin.h?ds=sidebyside diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index f99fb60c62..f95ef798e2 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -16,20 +16,25 @@ // 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, bool noRefresh = false); virtual void AdjustScrollbars(); - virtual void Scroll(int x, int y); 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, @@ -60,13 +65,13 @@ protected: } // and this does the same for Scroll() - void DoScroll(int orient, - int pos, - int pixelsPerLine, - int *posOld); + void DoScrollOneDir(int orient, + int pos, + int pixelsPerLine, + int *posOld); private: - DECLARE_NO_COPY_CLASS(wxScrollHelperNative) + DECLARE_NO_COPY_CLASS(wxScrollHelper) }; #endif // _WX_GTK_SCROLLWIN_H_