fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index b848808a1445d04df6f9c2ec80db89ab49c14ebf..0bb2d38f6a15f924e5fa6ef3fd3608204966987d 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "scrolbar.h"
+    #pragma implementation "univscrolbar.h"
 #endif
 
 #include "wx/wxprec.h"
@@ -531,14 +531,16 @@ void wxScrollBar::ScrollToEnd()
     DoSetThumb(m_range - m_thumbSize);
 }
 
-void wxScrollBar::ScrollLines(int nLines)
+bool wxScrollBar::ScrollLines(int nLines)
 {
     DoSetThumb(m_thumbPos + nLines);
+    return TRUE;
 }
 
-void wxScrollBar::ScrollPages(int nPages)
+bool wxScrollBar::ScrollPages(int nPages)
 {
     DoSetThumb(m_thumbPos + nPages*m_pageSize);
+    return TRUE;
 }
 
 // ============================================================================
@@ -653,7 +655,7 @@ void wxStdScrollBarInputHandler::HandleThumbMove(wxScrollBar *scrollbar,
     scrollbar->PerformAction(wxACTION_SCROLL_THUMB_MOVE, thumbPos);
 }
 
-bool wxStdScrollBarInputHandler::HandleKey(wxControl *control,
+bool wxStdScrollBarInputHandler::HandleKey(wxInputConsumer *consumer,
                                            const wxKeyEvent& event,
                                            bool pressed)
 {
@@ -675,16 +677,16 @@ bool wxStdScrollBarInputHandler::HandleKey(wxControl *control,
 
         if ( !!action )
         {
-            control->PerformAction(action);
+            consumer->PerformAction(action);
 
             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?
@@ -692,7 +694,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
     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,
@@ -706,7 +708,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
             if ( !m_winCapture )
             {
                 m_btnCapture = btn;
-                m_winCapture = control;
+                m_winCapture = consumer->GetInputWindow();
                 m_winCapture->CaptureMouse();
 
                 // generate the command
@@ -733,7 +735,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxControl *control,
                         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);
 
@@ -791,13 +793,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)
 {
-    wxScrollBar *scrollbar = wxStaticCast(control, wxScrollBar);
+    wxScrollBar *scrollbar = wxStaticCast(consumer->GetInputWindow(), wxScrollBar);
 
     if ( m_winCapture )
     {