X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..cba1c2ca127cbc8ce1aeb87b13b968caff0f995e:/src/univ/scrthumb.cpp diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp index 2313de7a1a..2852a6f280 100644 --- a/src/univ/scrthumb.cpp +++ b/src/univ/scrthumb.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univscrthumb.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,6 +25,7 @@ #ifndef WX_PRECOMP #include "wx/window.h" + #include "wx/renderer.h" #endif // WX_PRECOMP #include "wx/univ/scrtimer.h" @@ -155,7 +152,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 +162,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 +171,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 +215,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 +238,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 +256,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