X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef94bfc25eb21f1d3fa93b3d55c5a1ca18d8e62..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk1/scrolwin.h diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h index 4142805d1a..1447788a72 100644 --- a/include/wx/gtk1/scrolwin.h +++ b/include/wx/gtk1/scrolwin.h @@ -16,20 +16,23 @@ // wxScrolledWindow // ---------------------------------------------------------------------------- -class WXDLLEXPORT 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 base class pure virtuals 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); + // this does (each) half of AdjustScrollbars() work void DoAdjustScrollbar(GtkAdjustment *adj, int pixelsPerLine, @@ -40,14 +43,14 @@ protected: int *linesPerPage); // and this does the same for Scroll() - void DoScroll(int orient, - GtkAdjustment *adj, - int pos, - int pixelsPerLine, - int *posOld); + void DoScrollOneDir(int orient, + GtkAdjustment *adj, + int pos, + int pixelsPerLine, + int *posOld); private: - DECLARE_NO_COPY_CLASS(wxScrollHelperNative) + wxDECLARE_NO_COPY_CLASS(wxScrollHelper); }; #endif // _WX_GTK_SCROLLWIN_H_