better update rect calculation

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 3514ea22450a595619ab1c0c84c36c6b29ff84c2..614a0cf64026598a85ba69261b3de4b016b29c63 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -28,24 +28,21 @@
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 

-// extern wxList wxScrollBarList;
-extern void wxFindMaxSize(HWND hwnd, RECT *rect);
-

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 

-#if WXWIN_COMPATIBILITY

 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)

+#if WXWIN_COMPATIBILITY

   EVT_SCROLL(wxScrollBar::OnScroll)
   EVT_SCROLL(wxScrollBar::OnScroll)

-END_EVENT_TABLE()

 #endif
 #endif

+END_EVENT_TABLE()

 
 #endif
 
 // Scrollbar
 
 #endif
 
 // Scrollbar

-bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos,
            const wxPoint& pos,

-           const wxSize& size, const long style,
+           const wxSize& size, long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {


@@ -53,16 +50,16 @@ bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
         return FALSE;
     parent->AddChild(this);
     SetName(name);
         return FALSE;
     parent->AddChild(this);
     SetName(name);

-       SetValidator(validator);
+    SetValidator(validator);

     
     

-    SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-    SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+    SetBackgroundColour(parent->GetBackgroundColour()) ;
+    SetForegroundColour(parent->GetForegroundColour()) ;

     m_windowStyle = style;
 
   if ( id == -1 )
     m_windowStyle = style;
 
   if ( id == -1 )

-       m_windowId = (int)NewControlId();
+      m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+    m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
 
   int x = pos.x;
   int y = pos.y;


@@ -87,7 +84,7 @@ bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
     // Now create scrollbar
     DWORD _direction = (style & wxHORIZONTAL) ?
                         SBS_HORZ: SBS_VERT;
     // Now create scrollbar
     DWORD _direction = (style & wxHORIZONTAL) ?
                         SBS_HORZ: SBS_VERT;

-    HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(style), "SCROLLBAR", "scrollbar",
+    HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(style), _T("SCROLLBAR"), _T("scrollbar"),

                          _direction | WS_CHILD | WS_VISIBLE,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
                          _direction | WS_CHILD | WS_VISIBLE,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);


@@ -116,87 +113,88 @@ wxScrollBar::~wxScrollBar(void)
 {
 }
 
 {
 }
 

-void wxScrollBar::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
+                              WXWORD pos, WXHWND control)

 {
     int position = ::GetScrollPos((HWND) control, SB_CTL);
     int minPos, maxPos;
     ::GetScrollRange((HWND) control, SB_CTL, &minPos, &maxPos);
 {
     int position = ::GetScrollPos((HWND) control, SB_CTL);
     int minPos, maxPos;
     ::GetScrollRange((HWND) control, SB_CTL, &minPos, &maxPos);

+

 #if defined(__WIN95__)
 #if defined(__WIN95__)

-    // A page size greater than one has the effect of reducing the
-       // effective range, therefore the range has already been
-       // boosted artificially - so reduce it again.
-       if ( m_pageSize > 1 )
-               maxPos -= (m_pageSize - 1);
-#endif
+    // A page size greater than one has the effect of reducing the effective
+    // range, therefore the range has already been boosted artificially - so
+    // reduce it again.
+    if ( m_pageSize > 1 )
+        maxPos -= (m_pageSize - 1);
+#endif // __WIN95__

 
     wxEventType scrollEvent = wxEVT_NULL;
 
     int nScrollInc;
     switch ( wParam )
     {
 
     wxEventType scrollEvent = wxEVT_NULL;
 
     int nScrollInc;
     switch ( wParam )
     {

-            case SB_TOP:
-                    nScrollInc = maxPos - position;
-                    scrollEvent = wxEVT_SCROLL_TOP;
-                    break;
-
-            case SB_BOTTOM:
-                    nScrollInc = - position;
-                    scrollEvent = wxEVT_SCROLL_BOTTOM;
-                    break;
-
-            case SB_LINEUP:
-                    nScrollInc = -1;
-                    scrollEvent = wxEVT_SCROLL_LINEUP;
-                    break;
-
-            case SB_LINEDOWN:
-                    nScrollInc = 1;
-                    scrollEvent = wxEVT_SCROLL_LINEDOWN;
-                    break;
-
-            case SB_PAGEUP:
-                    nScrollInc = -GetPageSize();
-                    scrollEvent = wxEVT_SCROLL_PAGEUP;
-                    break;
-
-            case SB_PAGEDOWN:
-                    nScrollInc = GetPageSize();
-                    scrollEvent = wxEVT_SCROLL_PAGEDOWN;
-                    break;
-
-            case SB_THUMBTRACK:
-            case SB_THUMBPOSITION:
-                    nScrollInc = pos - position;
-                    scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-                    break;
-
-            default:
-                    nScrollInc = 0;
+        case SB_TOP:
+            nScrollInc = maxPos - position;
+            scrollEvent = wxEVT_SCROLL_TOP;
+            break;
+
+        case SB_BOTTOM:
+            nScrollInc = - position;
+            scrollEvent = wxEVT_SCROLL_BOTTOM;
+            break;
+
+        case SB_LINEUP:
+            nScrollInc = -1;
+            scrollEvent = wxEVT_SCROLL_LINEUP;
+            break;
+
+        case SB_LINEDOWN:
+            nScrollInc = 1;
+            scrollEvent = wxEVT_SCROLL_LINEDOWN;
+            break;
+
+        case SB_PAGEUP:
+            nScrollInc = -GetPageSize();
+            scrollEvent = wxEVT_SCROLL_PAGEUP;
+            break;
+
+        case SB_PAGEDOWN:
+            nScrollInc = GetPageSize();
+            scrollEvent = wxEVT_SCROLL_PAGEDOWN;
+            break;
+
+        case SB_THUMBTRACK:
+        case SB_THUMBPOSITION:
+            nScrollInc = pos - position;
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+            break;
+
+        default:
+            nScrollInc = 0;

     }
 
     }
 

-    if (nScrollInc != 0)
+    if ( nScrollInc == 0 )

     {
     {

-        int new_pos = position + nScrollInc;
-
-        if (new_pos < 0)
-            new_pos = 0;
-        if (new_pos > maxPos)
-            new_pos = maxPos;
-
-        SetValue(new_pos);
-        wxScrollEvent event(scrollEvent, m_windowId);
-        event.SetPosition(new_pos);
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
+        // no event to process, so don't process it
+        return FALSE;

     }
     }

-}

 
 

-void wxScrollBar::MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
-{
-       MSWOnVScroll(wParam, pos, control);
+    int new_pos = position + nScrollInc;
+
+    if (new_pos < 0)
+        new_pos = 0;
+    if (new_pos > maxPos)
+        new_pos = maxPos;
+
+    SetThumbPosition(new_pos);
+    wxScrollEvent event(scrollEvent, m_windowId);
+    event.SetPosition(new_pos);
+    event.SetEventObject( this );
+
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-void wxScrollBar::SetPosition(const int viewStart)
+void wxScrollBar::SetThumbPosition(int viewStart)

 {
 #if defined(__WIN95__)
   SCROLLINFO info;
 {
 #if defined(__WIN95__)
   SCROLLINFO info;


@@ -212,13 +210,13 @@ void wxScrollBar::SetPosition(const int viewStart)
 #endif
 }
 
 #endif
 }
 

-int wxScrollBar::GetPosition(void) const
+int wxScrollBar::GetThumbPosition(void) const

 {
     return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
 }
 
 {
     return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
 }
 

-void wxScrollBar::SetScrollbar(const int position, const int thumbSize, const int range, const int pageSize,
-    const bool refresh)
+void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
+    bool refresh)

 {
   m_viewSize = pageSize;
   m_pageSize = thumbSize;
 {
   m_viewSize = pageSize;
   m_pageSize = thumbSize;


@@ -233,7 +231,7 @@ void wxScrollBar::SetScrollbar(const int position, const int thumbSize, const in
   // (see comment for SetPageLength)
   if ( m_pageSize > 1 )
   {
   // (see comment for SetPageLength)
   if ( m_pageSize > 1 )
   {

-       range1 += (m_pageSize - 1);
+    range1 += (m_pageSize - 1);

   }
 
   SCROLLINFO info;
   }
 
   SCROLLINFO info;


@@ -264,7 +262,7 @@ MaxScrollPos = MaxRangeValue - (PageSize - 1)
 */
 
 #if WXWIN_COMPATIBILITY
 */
 
 #if WXWIN_COMPATIBILITY

-void wxScrollBar::SetPageSize(const int pageLength)
+void wxScrollBar::SetPageSize(int pageLength)

 {
   m_pageSize = pageLength;
 
 {
   m_pageSize = pageLength;
 


@@ -278,7 +276,7 @@ void wxScrollBar::SetPageSize(const int pageLength)
 #endif
 }
 
 #endif
 }
 

-void wxScrollBar::SetObjectLength(const int objectLength)
+void wxScrollBar::SetObjectLength(int objectLength)

 {
   m_objectSize = objectLength;
 
 {
   m_objectSize = objectLength;
 


@@ -291,7 +289,7 @@ void wxScrollBar::SetObjectLength(const int objectLength)
   // (see comment for SetPageLength)
   if ( m_pageSize > 1 )
   {
   // (see comment for SetPageLength)
   if ( m_pageSize > 1 )
   {

-       range += (m_pageSize - 1);
+    range += (m_pageSize - 1);

   }
 
   SCROLLINFO info;
   }
 
   SCROLLINFO info;


@@ -308,7 +306,7 @@ void wxScrollBar::SetObjectLength(const int objectLength)
 #endif
 }
 
 #endif
 }
 

-void wxScrollBar::SetViewLength(const int viewLength)
+void wxScrollBar::SetViewLength(int viewLength)

 {
     m_viewSize = viewLength;
 }
 {
     m_viewSize = viewLength;
 }


@@ -323,15 +321,15 @@ void wxScrollBar::GetValues(int *viewStart, int *viewLength, int *objectLength,
 }
 #endif
 
 }
 #endif
 

-WXHBRUSH wxScrollBar::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXHBRUSH wxScrollBar::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
   return 0;
 }
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 {
   return 0;
 }
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetValue(event.m_commandInt);
+    SetThumbPosition(event.m_commandInt);

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }