Added wxRegion::Offset(x,y)

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 9464b6973d432c893f3684a0883bde895fd387b6..0894cd920bb52b66677db7a9f2d569ac40991069 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -14,6 +14,7 @@
 
 #include "wx/window.h"
 
 
 #include "wx/window.h"
 

+class WXDLLEXPORT wxScrollHelperEvtHandler;

 class WXDLLEXPORT wxTimer;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxTimer;
 
 // ----------------------------------------------------------------------------


@@ -116,6 +117,10 @@ public:
     void HandleOnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
 
     void HandleOnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
 

+    // FIXME: this is needed for now for wxPlot compilation, should be removed
+    //        once it is fixed!
+    void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
+

 protected:
     // get pointer to our scroll rect if we use it or NULL
     const wxRect *GetRect() const
 protected:
     // get pointer to our scroll rect if we use it or NULL
     const wxRect *GetRect() const


@@ -139,6 +144,13 @@ protected:
             *h = size.y;
     }
 
             *h = size.y;
     }
 

+    // change just the target window (unlike SetWindow which changes m_win as
+    // well)
+    void DoSetTargetWindow(wxWindow *target);
+
+    // delete the event handler we installed
+    void DeleteEvtHandler();
+

     wxWindow             *m_win,
                          *m_targetWindow;
 
     wxWindow             *m_win,
                          *m_targetWindow;
 


@@ -164,13 +176,15 @@ protected:
 #if wxUSE_MOUSEWHEEL
     int m_wheelRotation;
 #endif // wxUSE_MOUSEWHEEL
 #if wxUSE_MOUSEWHEEL
     int m_wheelRotation;
 #endif // wxUSE_MOUSEWHEEL

+
+    wxScrollHelperEvtHandler *m_handler;

 };
 
 // ----------------------------------------------------------------------------
 // wxScrolledWindow: a wxWindow which knows how to scroll
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxScrolledWindow: a wxWindow which knows how to scroll
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK__
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)

     #include "wx/gtk/scrolwin.h"
 #else // !wxGTK
     #include "wx/generic/scrolwin.h"
     #include "wx/gtk/scrolwin.h"
 #else // !wxGTK
     #include "wx/generic/scrolwin.h"