X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a71d815bbe669ebb9bdb9409926a272c37a5a9aa..d3019e4d0a0730c31ba7ab64e0f80ac44e6ecc8a:/src/msw/scrolbar.cpp

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 20a45e346b..c9830b7754 100644
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -18,13 +18,14 @@
 
 #if wxUSE_SCROLLBAR
 
+#include "wx/scrolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/scrolbar.h"
 #include "wx/msw/private.h"
-#include "wx/settings.h"
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxScrollBarStyle )
@@ -130,7 +131,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 
         if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
         {
-            wxLogLastError(_T("GetScrollInfo"));
+            wxLogLastError(wxT("GetScrollInfo"));
         }
 
         trackPos = scrollInfo.nTrackPos;
@@ -157,12 +158,12 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     int nScrollInc;
     switch ( wParam )
     {
-        case SB_BOTTOM:
+        case SB_TOP:
             nScrollInc = maxPos - position;
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
-        case SB_TOP:
+        case SB_BOTTOM:
             nScrollInc = -position;
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
@@ -230,7 +231,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     event.SetPosition(position);
     event.SetEventObject( this );
 
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 void wxScrollBar::SetThumbPosition(int viewStart)
@@ -254,7 +255,7 @@ int wxScrollBar::GetThumbPosition(void) const
 
     if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
     {
-        wxLogLastError(_T("GetScrollInfo"));
+        wxLogLastError(wxT("GetScrollInfo"));
     }
     return scrollInfo.nPos;
 //    return ::GetScrollPos((HWND)m_hWnd, SB_CTL);