X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c2f37978674e79f0ffd8b41c46d6c698f90ccce..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/scrolwin.h diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index 9d9c0d9a6e..cf8854cf56 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/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,12 +99,6 @@ 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; // translate between scrolled and unscrolled coordinates void CalcScrolledPosition(int x, int y, int *xx, int *yy) const @@ -116,7 +118,7 @@ public: 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; @@ -157,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; @@ -179,3 +188,5 @@ private: #endif // _WX_GTK_SCROLLWIN_H_ + +// vi:sts=4:sw=4:et