routing native events first to the wx class and only if skipped call native handler

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index 909b6160974bab6cab95266aca92799406dac558..f95ef798e2971bc39ad04868541d61894a57985e 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -16,20 +16,25 @@
 // wxScrolledWindow
 // ----------------------------------------------------------------------------
 
 // wxScrolledWindow
 // ----------------------------------------------------------------------------
 

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

 {
 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,
                                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);
+
+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,


@@ -60,13 +65,13 @@ protected:
     }
 
     // and this does the same for Scroll()
     }
 
     // and this does the same for Scroll()

-    void DoScroll(int orient,
-                  int pos,
-                  int pixelsPerLine,
-                  int *posOld);
+    void DoScrollOneDir(int orient,
+                        int pos,
+                        int pixelsPerLine,
+                        int *posOld);

 
 private:
 
 private:

-    DECLARE_NO_COPY_CLASS(wxScrollHelperNative)
+    DECLARE_NO_COPY_CLASS(wxScrollHelper)

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