RemoveChild added for correct disposal of scrollbar

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index c85b28e56826602e3cbc34971053cd0f15dd266e..2986a6c9c4e5f60380e058768c5727884882a3e4 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;
 
 // ----------------------------------------------------------------------------


@@ -66,8 +67,26 @@ public:
     double GetScaleY() const { return m_scaleY; }
 
     // translate between scrolled and unscrolled coordinates
     double GetScaleY() const { return m_scaleY; }
 
     // translate between scrolled and unscrolled coordinates

-    virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
+    void CalcScrolledPosition(int x, int y, int *xx, int *yy) const
+        {  DoCalcScrolledPosition(x, y, xx, yy); }
+    wxPoint CalcScrolledPosition(const wxPoint& pt) const
+    {
+        wxPoint p2;
+        DoCalcScrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
+        return p2;
+    }
+
+    void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+        {  DoCalcUnscrolledPosition(x, y, xx, yy); }
+    wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
+    {
+        wxPoint p2;
+        DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
+        return p2;
+    }
+    
+    virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
+    virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;

 
     // Adjust the scrollbars
     virtual void AdjustScrollbars(void);
 
     // Adjust the scrollbars
     virtual void AdjustScrollbars(void);


@@ -116,6 +135,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 +162,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,6 +194,8 @@ protected:
 #if wxUSE_MOUSEWHEEL
     int m_wheelRotation;
 #endif // wxUSE_MOUSEWHEEL
 #if wxUSE_MOUSEWHEEL
     int m_wheelRotation;
 #endif // wxUSE_MOUSEWHEEL

+
+    wxScrollHelperEvtHandler *m_handler;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------