X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/scrolwin.h diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 486050a29d..cf9a27f234 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -22,6 +22,7 @@ class WXDLLEXPORT wxTimer; // wxScrolledWindow and wxScrolledControl. It is a mix-in: just derive from it // to implement scrolling in your class. // ---------------------------------------------------------------------------- +#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__) class WXDLLEXPORT wxScrollHelper { @@ -35,7 +36,7 @@ public: virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos = 0, int yPos = 0, - bool noRefresh = FALSE ); + bool noRefresh = false ); // scroll to the given (in logical coords) position virtual void Scroll(int x, int y); @@ -51,9 +52,9 @@ public: virtual void GetScrollPixelsPerUnit(int *pixelsPerUnitX, int *pixelsPerUnitY) const; - // Enable/disable Windows scrolling in either direction. If TRUE, wxWidgets + // 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. If false, the whole canvas is invalidated and a // Clear() is necessary. Disable for when the scroll increment is used to // actually scroll a non-constant distance virtual void EnableScrolling(bool x_scrolling, bool y_scrolling); @@ -121,7 +122,7 @@ public: // stop the timer, so it will be called repeatedly and will typically // return different values depending on the current mouse position // - // the base class version just returns TRUE + // the base class version just returns true virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const; // the methods to be called from the window event handlers @@ -141,7 +142,7 @@ public: #if WXWIN_COMPATIBILITY_2_2 // Compatibility only, don't use - void ViewStart(int *x, int *y) const { GetViewStart( x, y ); } + wxDEPRECATED( void ViewStart(int *x, int *y) const ); #endif // WXWIN_COMPATIBILITY_2_2 protected: @@ -205,6 +206,8 @@ protected: DECLARE_NO_COPY_CLASS(wxScrollHelper) }; +#endif + // ---------------------------------------------------------------------------- // wxScrolledWindow: a wxWindow which knows how to scroll // ---------------------------------------------------------------------------- @@ -219,7 +222,7 @@ protected: public: wxScrolledWindow() { } wxScrolledWindow(wxWindow *parent, - wxWindowID winid = -1, + wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle,