X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/univ/scrolbar.h diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h index af937ebae4..30c0e798b9 100644 --- a/include/wx/univ/scrolbar.h +++ b/include/wx/univ/scrolbar.h @@ -12,13 +12,14 @@ #ifndef _WX_UNIV_SCROLBAR_H_ #define _WX_UNIV_SCROLBAR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univscrolbar.h" #endif class WXDLLEXPORT wxScrollTimer; #include "wx/univ/scrarrow.h" +#include "wx/renderer.h" // ---------------------------------------------------------------------------- // the actions supported by this control @@ -87,7 +88,7 @@ public: virtual void SetThumbPosition(int thumbPos); virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = TRUE); + bool refresh = true); // wxScrollBar actions void ScrollToStart(); @@ -127,7 +128,7 @@ protected: virtual void DoDraw(wxControlRenderer *renderer); virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - // forces update of thumb's visual appearence (does nothing if m_dirty=FALSE) + // forces update of thumb's visual appearence (does nothing if m_dirty=false) void UpdateThumb(); // SetThumbPosition() helper @@ -191,14 +192,14 @@ public: // this method is called by wxScrollBarTimer only and may be overridden // - // return TRUE to continue scrolling, FALSE to stop the timer + // return true to continue scrolling, false to stop the timer virtual bool OnScrollTimer(wxScrollBar *scrollbar, const wxControlAction& action); protected: // the methods which must be overridden in the derived class - // return TRUE if the mouse button can be used to activate scrollbar, FALSE + // return true if the mouse button can be used to activate scrollbar, false // if not (only left mouse button can do it under Windows, any button under // GTK+) virtual bool IsAllowedButton(int button) = 0;