no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index 92ecc160d7ff302fb2321239b8d385a225b108f6..1447788a724e5acab8610ea850c8fcb456e7afda 100644 (file)
--- a/include/wx/gtk1/scrolwin.h
+++ b/include/wx/gtk1/scrolwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/scrolwin.h
+// Name:        wx/gtk1/scrolwin.h

 // Purpose:     wxScrolledWindow class
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common
 // Purpose:     wxScrolledWindow class
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common


@@ -16,20 +16,23 @@
 // wxScrolledWindow
 // ----------------------------------------------------------------------------
 
 // wxScrolledWindow
 // ----------------------------------------------------------------------------
 

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

 {
 public:
 {
 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 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:
 
 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,
     // 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()
                            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:
 
 private:

-    DECLARE_NO_COPY_CLASS(wxScrollHelperNative)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);

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