X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13ff9344d600ab38ad5ad4088d4a4797184405d2..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/scrolwin.h diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h index 4cc8040a11..cf8854cf56 100644 --- a/include/wx/gtk1/scrolwin.h +++ b/include/wx/gtk1/scrolwin.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/scrolwin.h +// Name: wx/gtk/scrolwin.h // Purpose: wxScrolledWindow class // Author: Robert Roebling // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GTK_SCROLLWIN_H_ #define _WX_GTK_SCROLLWIN_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "scrolwin.h" #endif @@ -65,9 +65,17 @@ public: virtual void SetTargetWindow( wxWindow *target, bool pushEventHandler = FALSE ); virtual wxWindow *GetTargetWindow(); + // Set the scrolled area of the window. + virtual void DoSetVirtualSize( int x, int y ); + + // Set the x, y scrolling increments. + void SetScrollRate( int xstep, int ystep ); + // Number of pixels per user unit (0 or -1 for no scrollbar) // Length of virtual canvas in user units // Length of page in user units + // Default action is to set the virtual size and alter scrollbars + // accordingly. virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos = 0, int yPos = 0, @@ -91,15 +99,28 @@ public: // Get the view start virtual void GetViewStart(int *x, int *y) const; - // Compatibility - void ViewStart(int *x, int *y) const - { GetViewStart( x, y ); } - // 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,6 +129,9 @@ 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(); @@ -122,8 +146,8 @@ public: 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(); @@ -135,16 +159,23 @@ public: // Overridden from wxWindows due callback being static virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ); +#if WXWIN_COMPATIBILITY_2_2 + // Compatibility + void ViewStart(int *x, int *y) const { GetViewStart( x, y ); } +#endif // WXWIN_COMPATIBILITY_2_2 + protected: wxWindow *m_targetWindow; int m_xScrollPixelsPerLine; int m_yScrollPixelsPerLine; bool m_xScrollingEnabled; bool m_yScrollingEnabled; + + // FIXME: these next four members are duplicated in the GtkAdjustment + // members of wxWindow. Can they be safely removed from here? + int m_xScrollPosition; int m_yScrollPosition; - int m_xScrollLines; - int m_yScrollLines; int m_xScrollLinesPerPage; int m_yScrollLinesPerPage; @@ -157,3 +188,5 @@ private: #endif // _WX_GTK_SCROLLWIN_H_ + +// vi:sts=4:sw=4:et