Darwin dlopen functions is needed both for DYNLIB_CLASS and DYNAMIC_LOADER

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

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index ba6e499d571f4e67ac4947133b21e371a685e622..e2f146b7d42f1d7e270f74545f21c7c65c47fde1 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -300,6 +300,12 @@ wxScrollArrows::Arrow wxScrollBar::HitTest(const wxPoint& pt) const
 // ----------------------------------------------------------------------------
 
 void wxScrollBar::OnIdle(wxIdleEvent& event)
 // ----------------------------------------------------------------------------
 
 void wxScrollBar::OnIdle(wxIdleEvent& event)

+{
+    UpdateThumb();
+    event.Skip();
+}
+
+void wxScrollBar::UpdateThumb()

 {
     if ( m_dirty )
     {
 {
     if ( m_dirty )
     {


@@ -373,8 +379,6 @@ void wxScrollBar::OnIdle(wxIdleEvent& event)
 
         m_dirty = FALSE;
     }
 
         m_dirty = FALSE;
     }

-
-    event.Skip();

 }
 
 void wxScrollBar::DoDraw(wxControlRenderer *renderer)
 }
 
 void wxScrollBar::DoDraw(wxControlRenderer *renderer)


@@ -464,6 +468,10 @@ bool wxScrollBar::PerformAction(const wxControlAction& action,
     {
         DoSetThumb(numArg);
 
     {
         DoSetThumb(numArg);
 

+        // VS: we have to force redraw here, otherwise the thumb will lack
+        //     behind mouse cursor
+        UpdateThumb();
+

         scrollType = wxEVT_SCROLLWIN_THUMBTRACK;
     }
     else if ( action == wxACTION_SCROLL_LINE_UP )
         scrollType = wxEVT_SCROLLWIN_THUMBTRACK;
     }
     else if ( action == wxACTION_SCROLL_LINE_UP )


@@ -675,7 +683,9 @@ bool wxStdScrollBarInputHandler::HandleKey(wxInputConsumer *consumer,
             case WXK_LEFT:      action = wxACTION_SCROLL_LINE_UP;   break;
             case WXK_HOME:      action = wxACTION_SCROLL_START;     break;
             case WXK_END:       action = wxACTION_SCROLL_END;       break;
             case WXK_LEFT:      action = wxACTION_SCROLL_LINE_UP;   break;
             case WXK_HOME:      action = wxACTION_SCROLL_START;     break;
             case WXK_END:       action = wxACTION_SCROLL_END;       break;

+            case WXK_PAGEUP:

             case WXK_PRIOR:     action = wxACTION_SCROLL_PAGE_UP;   break;
             case WXK_PRIOR:     action = wxACTION_SCROLL_PAGE_UP;   break;

+            case WXK_PAGEDOWN:

             case WXK_NEXT:      action = wxACTION_SCROLL_PAGE_DOWN; break;
         }
 
             case WXK_NEXT:      action = wxACTION_SCROLL_PAGE_DOWN; break;
         }