Correct a print format specifier mismatch in wxFileConfig::Parse().

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

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index b5e1253f3dcc38df73050a3bb1d5ccd880afa2ae..13c3570f79ddc20279ebc47b9633ffd8a67bf502 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -40,11 +40,9 @@
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 

-#define WXDEBUG_SCROLLBAR
-
-#ifndef __WXDEBUG__
-    #undef WXDEBUG_SCROLLBAR
-#endif // !__WXDEBUG__
+#if wxDEBUG_LEVEL >= 2
+    #define WXDEBUG_SCROLLBAR
+#endif

 
 #if defined(WXDEBUG_SCROLLBAR) && defined(__WXMSW__) && !defined(__WXMICROWIN__)
 #include "wx/msw/private.h"
 
 #if defined(WXDEBUG_SCROLLBAR) && defined(__WXMSW__) && !defined(__WXMICROWIN__)
 #include "wx/msw/private.h"


@@ -146,7 +144,7 @@ bool wxScrollBar::Create(wxWindow *parent,
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    SetBestSize(size);
+    SetInitialSize(size);

 
     // override the cursor of the target window (if any)
     SetCursor(wxCURSOR_ARROW);
 
     // override the cursor of the target window (if any)
     SetCursor(wxCURSOR_ARROW);


@@ -243,7 +241,7 @@ int wxScrollBar::GetRange() const
 
 void wxScrollBar::SetThumbPosition(int pos)
 {
 
 void wxScrollBar::SetThumbPosition(int pos)
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_range, _T("thumb position out of range") );
+    wxCHECK_RET( pos >= 0 && pos <= m_range, wxT("thumb position out of range") );

 
     DoSetThumb(pos);
 }
 
     DoSetThumb(pos);
 }


@@ -513,7 +511,7 @@ wxRect wxScrollBar::GetScrollbarRect(wxScrollBar::Element elem,
 
         case wxScrollBar::Element_Max:
         default:
 
         case wxScrollBar::Element_Max:
         default:

-            wxFAIL_MSG( _T("unknown scrollbar element") );
+            wxFAIL_MSG( wxT("unknown scrollbar element") );

     }
 
     return rect;
     }
 
     return rect;


@@ -935,11 +933,7 @@ void wxStdScrollBarInputHandler::StopScrolling(wxScrollBar *control)
 
     m_btnCapture = -1;
 
 
     m_btnCapture = -1;
 

-    if ( m_timerScroll )
-    {
-        delete m_timerScroll;
-        m_timerScroll = NULL;
-    }
+    wxDELETE(m_timerScroll);

 
     // unpress the arrow and highlight the current element
     Press(control, false);
 
     // unpress the arrow and highlight the current element
     Press(control, false);


@@ -1001,7 +995,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxInputConsumer *consumer,
     {
         // determine which part of the window mouse is in
         wxScrollBar *scrollbar = wxStaticCast(consumer->GetInputWindow(), wxScrollBar);
     {
         // determine which part of the window mouse is in
         wxScrollBar *scrollbar = wxStaticCast(consumer->GetInputWindow(), wxScrollBar);

-        wxHitTest ht = scrollbar->HitTest(event.GetPosition());
+        wxHitTest ht = scrollbar->HitTestBar(event.GetPosition());

 
         // when the mouse is pressed on any scrollbar element, we capture it
         // and hold capture until the same mouse button is released
 
         // when the mouse is pressed on any scrollbar element, we capture it
         // and hold capture until the same mouse button is released


@@ -1090,7 +1084,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxInputConsumer *consumer,
                 // this is not supposed to happen as the button can't go up
                 // without going down previously and then we'd have
                 // m_winCapture by now
                 // this is not supposed to happen as the button can't go up
                 // without going down previously and then we'd have
                 // m_winCapture by now

-                wxFAIL_MSG( _T("logic error in mouse capturing code") );
+                wxFAIL_MSG( wxT("logic error in mouse capturing code") );

             }
         }
     }
             }
         }
     }