no message

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index ab6f9668b50f2f0b47dcfda06f8a88123ee68a6d..007c98067ffb9024d0ac6a5c106aea8755499e0d 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -131,7 +131,6 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     wxEventType scrollEvent = wxEVT_NULL;
 
     int nScrollInc;
     wxEventType scrollEvent = wxEVT_NULL;
 
     int nScrollInc;

-    bool isScrolling = TRUE;

     switch ( wParam )
     {
         case SB_TOP:
     switch ( wParam )
     {
         case SB_TOP:


@@ -165,8 +164,9 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
             break;
 
         case SB_THUMBPOSITION:
             break;
 
         case SB_THUMBPOSITION:

-            isScrolling = FALSE;
-            /* fall-through */
+            nScrollInc = pos - position;
+            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+            break;

 
         case SB_THUMBTRACK:
             nScrollInc = pos - position;
 
         case SB_THUMBTRACK:
             nScrollInc = pos - position;


@@ -177,10 +177,10 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
             nScrollInc = 0;
     }
 
             nScrollInc = 0;
     }
 

-    if (( nScrollInc == 0 ) && isScrolling )
+    // don't process the event if there is no displacement,
+    // unless this is a thumb release event.
+    if (( nScrollInc == 0 ) && ( scrollEvent != wxEVT_SCROLL_THUMBRELEASE ))

     {
     {

-        // no event to process, so don't process it
-        // GRG: always process SB_THUMBPOSITION !

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -195,7 +195,6 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     wxScrollEvent event(scrollEvent, m_windowId);
     event.SetPosition(new_pos);
     event.SetEventObject( this );
     wxScrollEvent event(scrollEvent, m_windowId);
     event.SetPosition(new_pos);
     event.SetEventObject( this );

-    event.SetScrolling(isScrolling);

 
     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }