Better place for coordinate mirroring and removal

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

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 4fe391f0881a04ffcf976631010afc7ddb8b44fe..c9f56e5c74c0d972dc8aa78a11d0b4b91f6db52d 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/scrolbar.cpp
+// Name:        src/univ/scrolbar.cpp

 // Purpose:     wxScrollBar implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxScrollBar implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univscrolbar.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,12 +25,13 @@
 
 #if wxUSE_SCROLLBAR
 
 
 #if wxUSE_SCROLLBAR
 

+#include "wx/scrolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/timer.h"
 #ifndef WX_PRECOMP
     #include "wx/timer.h"

-

     #include "wx/dcclient.h"
     #include "wx/dcclient.h"

-    #include "wx/scrolbar.h"

     #include "wx/validate.h"
     #include "wx/validate.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/univ/scrtimer.h"
 #endif
 
 #include "wx/univ/scrtimer.h"


@@ -42,7 +39,6 @@
 #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
 


@@ -256,7 +252,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize,
                                int range, int pageSize,
                                bool refresh)
 {
                                int range, int pageSize,
                                bool refresh)
 {

-    // we only refresh everythign when the range changes, thumb position
+    // we only refresh everything when the range changes, thumb position

     // changes are handled in OnIdle
     bool needsRefresh = (range != m_range) ||
                         (thumbSize != m_thumbSize) ||
     // changes are handled in OnIdle
     bool needsRefresh = (range != m_range) ||
                         (thumbSize != m_thumbSize) ||


@@ -554,12 +550,18 @@ bool wxScrollBar::PerformAction(const wxControlAction& action,
             // NB: we assume that scrollbar events are sequentially numbered
             //     but this should be ok as other code relies on this as well
             scrollType += wxEVT_SCROLL_TOP - wxEVT_SCROLLWIN_TOP;
             // NB: we assume that scrollbar events are sequentially numbered
             //     but this should be ok as other code relies on this as well
             scrollType += wxEVT_SCROLL_TOP - wxEVT_SCROLLWIN_TOP;

+            wxScrollEvent event(scrollType, this->GetId(), m_thumbPos,
+                                IsVertical() ? wxVERTICAL : wxHORIZONTAL);
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event);
+        }
+        else // part of the window
+        {
+            wxScrollWinEvent event(scrollType, m_thumbPos,
+                                   IsVertical() ? wxVERTICAL : wxHORIZONTAL);
+            event.SetEventObject(this);
+            GetParent()->GetEventHandler()->ProcessEvent(event);

         }
         }

-
-        wxScrollWinEvent event(scrollType, m_thumbPos,
-                               IsVertical() ? wxVERTICAL : wxHORIZONTAL);
-        event.SetEventObject(this);
-        GetParent()->GetEventHandler()->ProcessEvent(event);

     }
 
     return true;
     }
 
     return true;


@@ -587,6 +589,15 @@ bool wxScrollBar::ScrollPages(int nPages)
     return true;
 }
 
     return true;
 }
 

+/* static */
+wxInputHandler *wxScrollBar::GetStdInputHandler(wxInputHandler *handlerDef)
+{
+    static wxStdScrollBarInputHandler
+        s_handler(wxTheme::Get()->GetRenderer(), handlerDef);
+
+    return &s_handler;
+}
+

 // ============================================================================
 // scroll bar input handler
 // ============================================================================
 // ============================================================================
 // scroll bar input handler
 // ============================================================================


@@ -715,10 +726,8 @@ 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_PAGEDOWN:
-            case WXK_NEXT:      action = wxACTION_SCROLL_PAGE_DOWN; break;
+            case WXK_PAGEUP:    action = wxACTION_SCROLL_PAGE_UP;   break;
+            case WXK_PAGEDOWN:  action = wxACTION_SCROLL_PAGE_DOWN; break;

         }
 
         if ( !action.IsEmpty() )
         }
 
         if ( !action.IsEmpty() )


@@ -737,7 +746,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxInputConsumer *consumer,
 {
     // is this a click event from an acceptable button?
     int btn = event.GetButton();
 {
     // is this a click event from an acceptable button?
     int btn = event.GetButton();

-    if ( (btn != -1) && IsAllowedButton(btn) )
+    if ( btn == wxMOUSE_BTN_LEFT )

     {
         // determine which part of the window mouse is in
         wxScrollBar *scrollbar = wxStaticCast(consumer->GetInputWindow(), wxScrollBar);
     {
         // determine which part of the window mouse is in
         wxScrollBar *scrollbar = wxStaticCast(consumer->GetInputWindow(), wxScrollBar);


@@ -849,7 +858,7 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
     if ( m_winCapture )
     {
 
     if ( m_winCapture )
     {

-        if ( (m_htLast == wxHT_SCROLLBAR_THUMB) && event.Moving() )
+        if ( (m_htLast == wxHT_SCROLLBAR_THUMB) && event.Dragging() )

         {
             // make the thumb follow the mouse by keeping the same offset
             // between the mouse position and the top/left of the thumb
         {
             // make the thumb follow the mouse by keeping the same offset
             // between the mouse position and the top/left of the thumb


@@ -864,7 +873,7 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
     bool isArrow = scrollbar->GetArrows().HandleMouseMove(event);
 
 
     bool isArrow = scrollbar->GetArrows().HandleMouseMove(event);
 

-    if ( event.Moving() )
+    if ( event.Dragging() )

     {
         wxHitTest ht = m_renderer->HitTestScrollbar
                                    (
     {
         wxHitTest ht = m_renderer->HitTestScrollbar
                                    (


@@ -907,6 +916,8 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
 #endif // wxUSE_SCROLLBAR
 
 
 #endif // wxUSE_SCROLLBAR
 

+#if wxUSE_TIMER
+

 // ----------------------------------------------------------------------------
 // wxScrollTimer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxScrollTimer
 // ----------------------------------------------------------------------------


@@ -950,3 +961,4 @@ void wxScrollTimer::Notify()
     }
 }
 
     }
 }
 

+#endif // wxUSE_TIMER