fixed handling of dst offset in wxAlphaBlend()

[wxWidgets.git] / src / univ / scrthumb.cpp

diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp
index 4d46b9c35b1a806a11fa83435638c90b053fbbf5..2852a6f280427a873732ff6045954b3492bdcd0b 100644 (file)
--- 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,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