Automatically adjust toolbar's tool size if the provided bitmaps

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index e65935be7a339e82a96852c59204bcfe2f757d0c..f95ef798e2971bc39ad04868541d61894a57985e 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -22,6 +22,7 @@ public:
     // default ctor doesn't do anything
     wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { }
 
     // 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,
     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,11 +70,6 @@ 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(wxScrollHelper)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };