fixed crash on invalid data (patch 1039453)

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

diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp
index 2313de7a1a1b9f9d7425a8c9d4a9220c9d480d36..c5a2460e92c5460fbf3b9f618746bc47a12809c9 100644 (file)
--- a/src/univ/scrthumb.cpp
+++ b/src/univ/scrthumb.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univscrthumb.h"
 #endif
 
     #pragma implementation "univscrthumb.h"
 #endif
 


@@ -29,6 +29,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/renderer.h"

 #endif // WX_PRECOMP
 
 #include "wx/univ/scrtimer.h"
 #endif // WX_PRECOMP
 
 #include "wx/univ/scrtimer.h"


@@ -155,7 +156,7 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const
     if ( btn == -1 )
     {
         // no...
     if ( btn == -1 )
     {
         // no...

-        return FALSE;
+        return false;

     }
 
     // when the mouse is pressed on any scrollbar element, we capture it
     }
 
     // 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
         if ( HasCapture() )
         {
             // mouse already captured, nothing to do

-            return FALSE;
+            return false;

         }
 
         // determine which part of the window the user clicked in
         }
 
         // 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
         if ( shaftPart == Shaft_None )
         {
             // mouse pressed over something else

-            return FALSE;
+            return false;

         }
 
         // capture the mouse
         }
 
         // capture the mouse


@@ -218,15 +219,15 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const
         delete m_captureData;
         wxConstCast(this, wxScrollThumb)->m_captureData = NULL;
 
         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
     }
     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
 }
 
 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
         }
 
         // we process all mouse events while the mouse is captured by us

-        return TRUE;
+        return true;

     }
     else // no capture
     {
     }
     else // no capture
     {


@@ -259,9 +260,9 @@ bool wxScrollThumb::HandleMouseMove(const wxMouseEvent& event) const
         if ( shaftPart != m_shaftPart )
         {
             // update the highlighted state
         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;
             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
         }
 
         // if the event happened on the shaft, it was for us and we processed