X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/830ed6d97d913f9d3cf53999a82d3507d5aebde4..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/gtk/scrolwin.h

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index c9abfd3dce..9d9c0d9a6e 100644
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -39,7 +39,7 @@ class WXDLLEXPORT wxScrolledWindow : public wxPanel
 public:
     wxScrolledWindow()
         { Init(); }
-        
+
     wxScrolledWindow(wxWindow *parent,
                      wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
@@ -47,7 +47,7 @@ public:
                      long style = wxScrolledWindowStyle,
                      const wxString& name = wxPanelNameStr)
         { Create(parent, id, pos, size, style, name); }
-        
+
     void Init();
 
     bool Create(wxWindow *parent,
@@ -62,7 +62,7 @@ public:
     // window (e.g. a child of it in order to scroll only a portion
     // the area between the scrollbars (spreadsheet: only cell area
     // will move).
-    virtual void SetTargetWindow( wxWindow *target );
+    virtual void SetTargetWindow( wxWindow *target, bool pushEventHandler = FALSE );
     virtual wxWindow *GetTargetWindow();
 
     // Number of pixels per user unit (0 or -1 for no scrollbar)
@@ -98,8 +98,27 @@ public:
     // Actual size in pixels when scrolling is taken into account
     virtual void GetVirtualSize(int *x, int *y) const;
 
-    virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
+    // translate between scrolled and unscrolled coordinates
+    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;
 
     // Override this function to draw the graphic (or just process EVT_PAINT)
     virtual void OnDraw(wxDC& WXUNUSED(dc)) {}
@@ -108,9 +127,12 @@ public:
     // automatically change the origin according to the scroll position.
     virtual void PrepareDC(wxDC& dc);
 
+    // lay out the window and its children
+    virtual bool Layout();
+
     // Adjust the scrollbars
     virtual void AdjustScrollbars();
-    
+
     // Set the scale factor, used in PrepareDC
     void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; }
     double GetScaleX() const { return m_scaleX; }
@@ -121,9 +143,9 @@ public:
     void OnSize(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent& event);
-    
-    void GtkVScroll( float value );
-    void GtkHScroll( float value );
+
+    void GtkVScroll( float value, unsigned int scroll_type );
+    void GtkHScroll( float value, unsigned int scroll_type );
     void GtkVConnectEvent();
     void GtkHConnectEvent();
     void GtkVDisconnectEvent();
@@ -131,10 +153,10 @@ public:
 
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
-    
+
     // Overridden from wxWindows due callback being static
     virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-    
+
 protected:
     wxWindow             *m_targetWindow;
     int                   m_xScrollPixelsPerLine;
@@ -147,7 +169,7 @@ protected:
     int                   m_yScrollLines;
     int                   m_xScrollLinesPerPage;
     int                   m_yScrollLinesPerPage;
-    
+
     double                m_scaleY,m_scaleX;
 
 private: