X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13ff9344d600ab38ad5ad4088d4a4797184405d2..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/scrolwin.h diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 8bf0404a25..486050a29d 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -44,11 +44,14 @@ public: int GetScrollPageSize(int orient) const; void SetScrollPageSize(int orient, int pageSize); + // Set the x, y scrolling increments. + void SetScrollRate( int xstep, int ystep ); + // get the size of one logical unit in physical ones virtual void GetScrollPixelsPerUnit(int *pixelsPerUnitX, int *pixelsPerUnitY) const; - // Enable/disable Windows scrolling in either direction. If TRUE, wxWindows + // Enable/disable Windows scrolling in either direction. If TRUE, wxWidgets // scrolls the canvas and only a bit of the canvas is invalidated; no // Clear() is necessary. If FALSE, the whole canvas is invalidated and a // Clear() is necessary. Disable for when the scroll increment is used to @@ -58,17 +61,32 @@ public: // Get the view start virtual void GetViewStart(int *x, int *y) const; - // Actual size in pixels when scrolling is taken into account - virtual void GetVirtualSize(int *x, int *y) const; - // 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; } 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); @@ -80,7 +98,7 @@ public: // occasions you might want it to scroll [part of] another 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, bool pushEventHandler = FALSE); + virtual void SetTargetWindow(wxWindow *target); virtual wxWindow *GetTargetWindow() const; void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; } @@ -121,9 +139,14 @@ public: // once it is fixed! void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); } +#if WXWIN_COMPATIBILITY_2_2 + // Compatibility only, don't use + void ViewStart(int *x, int *y) const { GetViewStart( x, y ); } +#endif // WXWIN_COMPATIBILITY_2_2 + protected: // get pointer to our scroll rect if we use it or NULL - const wxRect *GetRect() const + const wxRect *GetScrollRect() const { return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL; } @@ -146,7 +169,7 @@ protected: // change just the target window (unlike SetWindow which changes m_win as // well) - void DoSetTargetWindow(wxWindow *target, bool pushEventHandler = FALSE); + void DoSetTargetWindow(wxWindow *target); // delete the event handler we installed void DeleteEvtHandler(); @@ -178,6 +201,8 @@ protected: #endif // wxUSE_MOUSEWHEEL wxScrollHelperEvtHandler *m_handler; + + DECLARE_NO_COPY_CLASS(wxScrollHelper) }; // ---------------------------------------------------------------------------- @@ -194,17 +219,17 @@ protected: public: wxScrolledWindow() { } wxScrolledWindow(wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle, const wxString& name = wxPanelNameStr) - : wxGenericScrolledWindow(parent, id, pos, size, style, name) + : wxGenericScrolledWindow(parent, winid, pos, size, style, name) { } private: - DECLARE_CLASS(wxScrolledWindow) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow) }; #define wxSCROLLED_WINDOW_IS_GENERIC 1 @@ -212,3 +237,4 @@ protected: #endif // _WX_SCROLWIN_H_BASE_ +