Separated wxImage::FloodFill from image.cpp

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

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 4445239eb97b64e196393ae12358a91cde27a2e8..66d0d7a1735bc7d4c93c545a45bcd5ee0e1416dd 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -42,6 +42,7 @@
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"

+#include "wx/log.h"

 
 #define WXDEBUG_SCROLLBAR
 
 
 #define WXDEBUG_SCROLLBAR
 


@@ -164,6 +165,24 @@ wxScrollBar::~wxScrollBar()
 {
 }
 
 {
 }
 

+bool wxScrollBar::AcceptsFocus() const
+{
+    if (!wxWindow::AcceptsFocus()) return FALSE;
+    
+    wxWindow *parent = (wxWindow*) GetParent();
+    
+    if (parent)
+    {
+        if ((parent->GetScrollbar( wxHORIZONTAL ) == this) ||
+            (parent->GetScrollbar( wxVERTICAL ) == this))
+        {
+            return FALSE;
+        }
+    }
+    
+    return TRUE;
+}
+

 // ----------------------------------------------------------------------------
 // scrollbar API
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // scrollbar API
 // ----------------------------------------------------------------------------


@@ -300,6 +319,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 )
     {


@@ -364,7 +389,7 @@ void wxScrollBar::OnIdle(wxIdleEvent& event)
         }
 #endif // WXDEBUG_SCROLLBAR
 
         }
 #endif // WXDEBUG_SCROLLBAR
 

-                    Refresh(TRUE, &rect);
+                    Refresh(FALSE, &rect);

                 }
 
                 m_elementsState[n] &= ~wxCONTROL_DIRTY;
                 }
 
                 m_elementsState[n] &= ~wxCONTROL_DIRTY;


@@ -373,8 +398,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 +487,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 )