make Scroll() itself virtual too as existing code might override it (but new code should override DoScroll() only); use the same access in the derived classes as in wxScrollHelperBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,6 +22,7 @@ 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,11 +70,6 @@ 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)
|
||||
};
|
||||
|
Reference in New Issue
Block a user