No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index facf1d2b49fff5f7450eb013558f7e4b120e8b01..c2fcbfd411a5b26130d666557814221da242b20d 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common
 // Created:     01/02/97
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,12 +15,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 +30,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,10 +70,7 @@ protected:
                         int pixelsPerLine,
                         int *posOld);
 
                         int pixelsPerLine,
                         int *posOld);
 

-    virtual void DoScroll(int x, int y);
-
-private:
-    DECLARE_NO_COPY_CLASS(wxScrollHelperNative)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);

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