X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..c0e7c9a98bb5cdfaccf4df3d13da846d022957f8:/src/univ/scrthumb.cpp diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp index de21964d41..c5a2460e92 100644 --- a/src/univ/scrthumb.cpp +++ b/src/univ/scrthumb.cpp @@ -6,7 +6,7 @@ // Created: 13.02.01 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,8 +17,8 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "scrthumb.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma implementation "univscrthumb.h" #endif #include "wx/wxprec.h" @@ -29,6 +29,7 @@ #ifndef WX_PRECOMP #include "wx/window.h" + #include "wx/renderer.h" #endif // WX_PRECOMP #include "wx/univ/scrtimer.h" @@ -155,7 +156,7 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const if ( btn == -1 ) { // no... - return FALSE; + return false; } // when the mouse is pressed on any scrollbar element, we capture it @@ -165,7 +166,7 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const if ( HasCapture() ) { // mouse already captured, nothing to do - return FALSE; + return false; } // determine which part of the window the user clicked in @@ -174,7 +175,7 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const if ( shaftPart == Shaft_None ) { // mouse pressed over something else - return FALSE; + return false; } // capture the mouse @@ -218,15 +219,15 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const delete m_captureData; wxConstCast(this, wxScrollThumb)->m_captureData = NULL; - m_control->SetShaftPartState(shaftPart, wxCONTROL_PRESSED, FALSE); + m_control->SetShaftPartState(shaftPart, wxCONTROL_PRESSED, false); } else // another mouse button released { // we don't process this - return FALSE; + return false; } - return TRUE; + return true; } bool wxScrollThumb::HandleMouseMove(const wxMouseEvent& event) const @@ -241,7 +242,7 @@ bool wxScrollThumb::HandleMouseMove(const wxMouseEvent& event) const } // we process all mouse events while the mouse is captured by us - return TRUE; + return true; } else // no capture { @@ -259,9 +260,9 @@ bool wxScrollThumb::HandleMouseMove(const wxMouseEvent& event) const if ( shaftPart != m_shaftPart ) { // update the highlighted state - m_control->SetShaftPartState(m_shaftPart, wxCONTROL_CURRENT, FALSE); + m_control->SetShaftPartState(m_shaftPart, wxCONTROL_CURRENT, false); wxConstCast(this, wxScrollThumb)->m_shaftPart = shaftPart; - m_control->SetShaftPartState(m_shaftPart, wxCONTROL_CURRENT, TRUE); + m_control->SetShaftPartState(m_shaftPart, wxCONTROL_CURRENT, true); } // if the event happened on the shaft, it was for us and we processed