wxUniv compilation fixes

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 614a0cf64026598a85ba69261b3de4b016b29c63..c4fbe72399dcb96597c002d4d5fc3bcef29f6c7c 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -1,34 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.cpp
+// Name:        msw/scrolbar.cpp

 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

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

-#pragma implementation "scrolbar.h"
+    #pragma implementation "scrolbar.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_SCROLLBAR
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
-#include "wx/utils.h"
+    #include "wx/utils.h"

 #endif
 
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARY

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


@@ -37,7 +37,6 @@ BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 #endif
 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 

-#endif

 
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,


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

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

-    
+#endif // wxUSE_VALIDATORS
+
+    if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
+        style |= wxNO_BORDER;
+

     SetBackgroundColour(parent->GetBackgroundColour()) ;
     SetForegroundColour(parent->GetForegroundColour()) ;
     m_windowStyle = style;
     SetBackgroundColour(parent->GetBackgroundColour()) ;
     SetForegroundColour(parent->GetForegroundColour()) ;
     m_windowStyle = style;


@@ -81,11 +85,14 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
         height = 14;
     }
 
         height = 14;
     }
 

+    WXDWORD exStyle = 0;
+    WXDWORD wstyle = MSWGetStyle(style, & exStyle) ;
+

     // 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), _T("SCROLLBAR"), _T("scrollbar"),
-                         _direction | WS_CHILD | WS_VISIBLE,
+    HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxT("scrollbar"),
+                         _direction | wstyle,

                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
 
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
 


@@ -114,11 +121,44 @@ wxScrollBar::~wxScrollBar(void)
 }
 
 bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 }
 
 bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,

-                              WXWORD pos, WXHWND control)
+                              WXWORD pos, WXHWND WXUNUSED(control))

 {
 {

-    int position = ::GetScrollPos((HWND) control, SB_CTL);
-    int minPos, maxPos;
-    ::GetScrollRange((HWND) control, SB_CTL, &minPos, &maxPos);
+    // current and max positions
+    int position,
+        maxPos, trackPos = pos;
+
+    // when we're dragging the scrollbar we can't use pos parameter because it
+    // is limited to 16 bits
+    // JACS: now always using GetScrollInfo, since there's no reason
+    // not to
+//    if ( wParam == SB_THUMBPOSITION || wParam == SB_THUMBTRACK )
+    {
+        SCROLLINFO scrollInfo;
+        wxZeroMemory(scrollInfo);
+        scrollInfo.cbSize = sizeof(SCROLLINFO);
+
+        // also get the range if we call GetScrollInfo() anyhow -- this is less
+        // expensive than call it once here and then call GetScrollRange()
+        // below
+        scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_TRACKPOS;
+
+        if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
+        {
+            wxLogLastError(_T("GetScrollInfo"));
+        }
+
+        trackPos = scrollInfo.nTrackPos;
+        position = scrollInfo.nPos;
+        maxPos = scrollInfo.nMax;
+    }
+#if 0
+    else
+    {
+        position = ::GetScrollPos((HWND) control, SB_CTL);
+        int minPos;
+        ::GetScrollRange((HWND) control, SB_CTL, &minPos, &maxPos);
+    }
+#endif

 
 #if defined(__WIN95__)
     // A page size greater than one has the effect of reducing the effective
 
 #if defined(__WIN95__)
     // A page size greater than one has the effect of reducing the effective


@@ -133,13 +173,13 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     int nScrollInc;
     switch ( wParam )
     {
     int nScrollInc;
     switch ( wParam )
     {

-        case SB_TOP:
+        case SB_BOTTOM:

             nScrollInc = maxPos - position;
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
             nScrollInc = maxPos - position;
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 

-        case SB_BOTTOM:
-            nScrollInc = - position;
+        case SB_TOP:
+            nScrollInc = -position;

             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 


@@ -163,32 +203,47 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 

-        case SB_THUMBTRACK:

         case SB_THUMBPOSITION:
         case SB_THUMBPOSITION:

-            nScrollInc = pos - position;
+            nScrollInc = trackPos - position;
+            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+            break;
+
+        case SB_THUMBTRACK:
+            nScrollInc = trackPos - position;

             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 
             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 

+        case SB_ENDSCROLL:
+            nScrollInc = 0;
+            scrollEvent = wxEVT_SCROLL_ENDSCROLL;
+            break;
+

         default:
             nScrollInc = 0;
     }
 
         default:
             nScrollInc = 0;
     }
 

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

     {
     {

-        // no event to process, so don't process it
-        return FALSE;
-    }
+        position += nScrollInc;

 
 

-    int new_pos = position + nScrollInc;
+        if ( position < 0 )
+            position = 0;
+        if ( position > maxPos )
+            position = maxPos;

 
 

-    if (new_pos < 0)
-        new_pos = 0;
-    if (new_pos > maxPos)
-        new_pos = maxPos;
+        SetThumbPosition(position);
+    }
+    else if ( scrollEvent != wxEVT_SCROLL_THUMBRELEASE &&
+                scrollEvent != wxEVT_SCROLL_ENDSCROLL )
+    {
+        // don't process the event if there is no displacement,
+        // unless this is a thumb release or end scroll event.
+        return FALSE;
+    }

 
 

-    SetThumbPosition(new_pos);

     wxScrollEvent event(scrollEvent, m_windowId);
     wxScrollEvent event(scrollEvent, m_windowId);

-    event.SetPosition(new_pos);
+    event.SetOrientation(IsVertical() ? wxVERTICAL : wxHORIZONTAL);
+    event.SetPosition(position);

     event.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent(event);
     event.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent(event);


@@ -197,22 +252,32 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 #if defined(__WIN95__)
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 #if defined(__WIN95__)

-  SCROLLINFO info;
-  info.cbSize = sizeof(SCROLLINFO);
-  info.nPage = 0;
-  info.nMin = 0;
-  info.nPos = viewStart;
-  info.fMask = SIF_POS ;
-
-  ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE);
+    SCROLLINFO info;
+    info.cbSize = sizeof(SCROLLINFO);
+    info.nPage = 0;
+    info.nMin = 0;
+    info.nPos = viewStart;
+    info.fMask = SIF_POS ;
+
+    ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE);

 #else
 #else

-  ::SetScrollPos((HWND) GetHWND(), SB_CTL, viewStart, TRUE);
+    ::SetScrollPos((HWND) GetHWND(), SB_CTL, viewStart, TRUE);

 #endif
 }
 
 int wxScrollBar::GetThumbPosition(void) const
 {
 #endif
 }
 
 int wxScrollBar::GetThumbPosition(void) const
 {

-    return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
+    SCROLLINFO scrollInfo;
+    wxZeroMemory(scrollInfo);
+    scrollInfo.cbSize = sizeof(SCROLLINFO);
+    scrollInfo.fMask = SIF_POS;
+    
+    if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
+    {
+        wxLogLastError(_T("GetScrollInfo"));
+    }
+    return scrollInfo.nPos;
+//    return ::GetScrollPos((HWND)m_hWnd, SB_CTL);

 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,


@@ -257,8 +322,8 @@ In version 4.0 or later, the maximum value that a scroll bar can report
 If the scroll bar has a page size greater than one, the maximum scrolling position
 is less than the maximum range value. You can use the following formula to calculate
 the maximum scrolling position:
 If the scroll bar has a page size greater than one, the maximum scrolling position
 is less than the maximum range value. You can use the following formula to calculate
 the maximum scrolling position:

-  
-MaxScrollPos = MaxRangeValue - (PageSize - 1) 
+
+MaxScrollPos = MaxRangeValue - (PageSize - 1)

 */
 
 #if WXWIN_COMPATIBILITY
 */
 
 #if WXWIN_COMPATIBILITY


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

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

 {
   return 0;
 }
 {
   return 0;
 }


@@ -347,3 +412,5 @@ void wxScrollBar::OnScroll(wxScrollEvent& event)
     }
 }
 #endif
     }
 }
 #endif

+
+#endif // wxUSE_SCROLLBAR