Compilation fix after r62754.

[wxWidgets.git] / include / wx / gtk / scrolwin.h

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index 7b4d75c00e71a9b5d6fce5922b55da5242a71557..dac8d766895ffa12f5d424d82216cc803b85c249 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -16,12 +16,14 @@
 // wxScrolledWindow
 // ----------------------------------------------------------------------------
 
 // wxScrolledWindow
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxScrollHelperNative : public wxScrollHelper
+class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase

 {
 {

+    typedef wxScrollHelperBase base_type;

 public:
     // default ctor doesn't do anything
 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,
     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 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,
     // this does (each) half of AdjustScrollbars() work
     void DoAdjustScrollbar(GtkRange* range,
                            int pixelsPerLine,


@@ -64,13 +71,7 @@ protected:
                         int pixelsPerLine,
                         int *posOld);
 
                         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)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);

 };
 
 #endif // _WX_GTK_SCROLLWIN_H_
 };
 
 #endif // _WX_GTK_SCROLLWIN_H_