Smooth Aqua buttons in wxTreeCtrl.

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

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index c3d4fd5df2b236b064e3cff20d6c60719f4ac6f9..ba6e499d571f4e67ac4947133b21e371a685e622 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -49,6 +49,10 @@
     #undef WXDEBUG_SCROLLBAR
 #endif // !__WXDEBUG__
 
     #undef WXDEBUG_SCROLLBAR
 #endif // !__WXDEBUG__
 

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

 // ----------------------------------------------------------------------------
 // wxScrollBarTimer: this class is used to repeatedly scroll the scrollbar
 // when the mouse is help pressed on the arrow or on the bar. It generates the
 // ----------------------------------------------------------------------------
 // wxScrollBarTimer: this class is used to repeatedly scroll the scrollbar
 // when the mouse is help pressed on the arrow or on the bar. It generates the


@@ -655,7 +659,7 @@ void wxStdScrollBarInputHandler::HandleThumbMove(wxScrollBar *scrollbar,
     scrollbar->PerformAction(wxACTION_SCROLL_THUMB_MOVE, thumbPos);
 }
 
     scrollbar->PerformAction(wxACTION_SCROLL_THUMB_MOVE, thumbPos);
 }
 

-bool wxStdScrollBarInputHandler::HandleKey(wxControl *control,
+bool wxStdScrollBarInputHandler::HandleKey(wxInputConsumer *consumer,

                                            const wxKeyEvent& event,
                                            bool pressed)
 {
                                            const wxKeyEvent& event,
                                            bool pressed)
 {


@@ -677,16 +681,16 @@ bool wxStdScrollBarInputHandler::HandleKey(wxControl *control,
 
         if ( !!action )
         {
 
         if ( !!action )
         {

-            control->PerformAction(action);
+            consumer->PerformAction(action);

 
             return TRUE;
         }
     }
 
 
             return TRUE;
         }
     }
 

-    return wxStdInputHandler::HandleKey(control, event, pressed);
+    return wxStdInputHandler::HandleKey(consumer, event, pressed);

 }
 
 }
 

-bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
+bool wxStdScrollBarInputHandler::HandleMouse(wxInputConsumer *consumer,

                                              const wxMouseEvent& event)
 {
     // is this a click event from an acceptable button?
                                              const wxMouseEvent& event)
 {
     // is this a click event from an acceptable button?


@@ -694,7 +698,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
     if ( (btn != -1) && IsAllowedButton(btn) )
     {
         // determine which part of the window mouse is in
     if ( (btn != -1) && IsAllowedButton(btn) )
     {
         // determine which part of the window mouse is in

-        wxScrollBar *scrollbar = wxStaticCast(control, wxScrollBar);
+        wxScrollBar *scrollbar = wxStaticCast(consumer->GetInputWindow(), wxScrollBar);

         wxHitTest ht = m_renderer->HitTestScrollbar
                                    (
                                     scrollbar,
         wxHitTest ht = m_renderer->HitTestScrollbar
                                    (
                                     scrollbar,


@@ -708,7 +712,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
             if ( !m_winCapture )
             {
                 m_btnCapture = btn;
             if ( !m_winCapture )
             {
                 m_btnCapture = btn;

-                m_winCapture = control;
+                m_winCapture = consumer->GetInputWindow();

                 m_winCapture->CaptureMouse();
 
                 // generate the command
                 m_winCapture->CaptureMouse();
 
                 // generate the command


@@ -735,7 +739,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
                         break;
 
                     case wxHT_SCROLLBAR_THUMB:
                         break;
 
                     case wxHT_SCROLLBAR_THUMB:

-                        control->PerformAction(wxACTION_SCROLL_THUMB_DRAG);
+                        consumer->PerformAction(wxACTION_SCROLL_THUMB_DRAG);

                         m_ofsMouse = GetMouseCoord(scrollbar, event) -
                                      m_renderer->ScrollbarToPixel(scrollbar);
 
                         m_ofsMouse = GetMouseCoord(scrollbar, event) -
                                      m_renderer->ScrollbarToPixel(scrollbar);
 


@@ -793,13 +797,13 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
         }
     }
 
         }
     }
 

-    return wxStdInputHandler::HandleMouse(control, event);
+    return wxStdInputHandler::HandleMouse(consumer, event);

 }
 
 }
 

-bool wxStdScrollBarInputHandler::HandleMouseMove(wxControl *control,
+bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer,

                                                  const wxMouseEvent& event)
 {
                                                  const wxMouseEvent& event)
 {

-    wxScrollBar *scrollbar = wxStaticCast(control, wxScrollBar);
+    wxScrollBar *scrollbar = wxStaticCast(consumer->GetInputWindow(), wxScrollBar);

 
     if ( m_winCapture )
     {
 
     if ( m_winCapture )
     {