Use minimal required process access mask in wxMSW wxKill().

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 48e10b9d713337fa493f96172411cb6f054ce820..f45e294396ad2527f2b47d7fe59725ad314a6013 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -22,13 +18,14 @@
 
 #if wxUSE_SCROLLBAR
 
 
 #if wxUSE_SCROLLBAR
 

+#include "wx/scrolbar.h"
+

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

+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include "wx/scrolbar.h"

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

-#include "wx/settings.h"

 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxScrollBarStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxScrollBarStyle )


@@ -69,7 +66,7 @@ wxEND_FLAGS( wxScrollBarStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxScrollBar)

-    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
+    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )

 
     wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 
     wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))


@@ -109,113 +106,75 @@ wxScrollBar::~wxScrollBar(void)
 }
 
 bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 }
 
 bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,

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

 {
 {

-    // current and max positions
-    int position,
-        maxPos, trackPos = pos;
-
-    wxUnusedVar(trackPos);
+    // don't use pos parameter because it is limited to 16 bits, get the full
+    // 32 bit position from the control itself instead
+    WinStruct<SCROLLINFO> scrollInfo;
+    scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_TRACKPOS;

 
 

-    // 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
+    if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )

     {
     {

-        position = ::GetScrollPos((HWND) control, SB_CTL);
-        int minPos;
-        ::GetScrollRange((HWND) control, SB_CTL, &minPos, &maxPos);
+        wxLogLastError(wxT("GetScrollInfo"));
+        return false;

     }
     }

-#endif

 
 

-#if defined(__WIN95__)
+    int maxPos = scrollInfo.nMax;
+

     // 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);
     // 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__

 
 

+    int position = scrollInfo.nPos;

     wxEventType scrollEvent = wxEVT_NULL;
     wxEventType scrollEvent = wxEVT_NULL;

-
-    int nScrollInc;

     switch ( wParam )
     {
     switch ( wParam )
     {

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

             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 

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

             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:

-            nScrollInc = -1;
+            position--;

             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:
             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:

-            nScrollInc = 1;
+            position++;

             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:
             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:

-            nScrollInc = -GetPageSize();
+            position -= GetPageSize();

             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:
             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:

-            nScrollInc = GetPageSize();
+            position += GetPageSize();

             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBPOSITION:
             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBPOSITION:

-            nScrollInc = trackPos - position;
-            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
-            break;
-

         case SB_THUMBTRACK:
         case SB_THUMBTRACK:

-            nScrollInc = trackPos - position;
-            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+            position = scrollInfo.nTrackPos;
+            scrollEvent = wParam == SB_THUMBPOSITION ? wxEVT_SCROLL_THUMBRELEASE
+                                                     : wxEVT_SCROLL_THUMBTRACK;

             break;
 
         case SB_ENDSCROLL:
             break;
 
         case SB_ENDSCROLL:

-            nScrollInc = 0;
-            scrollEvent = wxEVT_SCROLL_ENDSCROLL;
+            scrollEvent = wxEVT_SCROLL_CHANGED;

             break;
             break;

-
-        default:
-            nScrollInc = 0;

     }
 
     }
 

-    if ( nScrollInc )
+    if ( position != scrollInfo.nPos )

     {
     {

-        position += nScrollInc;
-

         if ( position < 0 )
             position = 0;
         if ( position > maxPos )
         if ( position < 0 )
             position = 0;
         if ( position > maxPos )


@@ -224,7 +183,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
         SetThumbPosition(position);
     }
     else if ( scrollEvent != wxEVT_SCROLL_THUMBRELEASE &&
         SetThumbPosition(position);
     }
     else if ( scrollEvent != wxEVT_SCROLL_THUMBRELEASE &&

-                scrollEvent != wxEVT_SCROLL_ENDSCROLL )
+                scrollEvent != wxEVT_SCROLL_CHANGED )

     {
         // don't process the event if there is no displacement,
         // unless this is a thumb release or end scroll event.
     {
         // don't process the event if there is no displacement,
         // unless this is a thumb release or end scroll event.


@@ -236,12 +195,11 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     event.SetPosition(position);
     event.SetEventObject( this );
 
     event.SetPosition(position);
     event.SetEventObject( this );
 

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 }
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-#if defined(__WIN95__)

     SCROLLINFO info;
     info.cbSize = sizeof(SCROLLINFO);
     info.nPage = 0;
     SCROLLINFO info;
     info.cbSize = sizeof(SCROLLINFO);
     info.nPage = 0;


@@ -250,9 +208,6 @@ void wxScrollBar::SetThumbPosition(int viewStart)
     info.fMask = SIF_POS ;
 
     ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE);
     info.fMask = SIF_POS ;
 
     ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE);

-#else
-    ::SetScrollPos((HWND) GetHWND(), SB_CTL, viewStart, TRUE);
-#endif

 }
 
 int wxScrollBar::GetThumbPosition(void) const
 }
 
 int wxScrollBar::GetThumbPosition(void) const


@@ -264,45 +219,39 @@ int wxScrollBar::GetThumbPosition(void) const
 
     if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
     {
 
     if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
     {

-        wxLogLastError(_T("GetScrollInfo"));
+        wxLogLastError(wxT("GetScrollInfo"));

     }
     return scrollInfo.nPos;
     }
     return scrollInfo.nPos;

-//    return ::GetScrollPos((HWND)m_hWnd, SB_CTL);

 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh)
 {
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh)
 {

-  m_viewSize = pageSize;
-  m_pageSize = thumbSize;
-  m_objectSize = range;
-
-  // The range (number of scroll steps) is the
-  // object length minus the page size.
-  int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
-
-#if defined(__WIN95__)
-  // Try to adjust the range to cope with page size > 1
-  // (see comment for SetPageLength)
-  if ( m_pageSize > 1 )
-  {
-    range1 += (m_pageSize - 1);
-  }
-
-  SCROLLINFO info;
-  info.cbSize = sizeof(SCROLLINFO);
-  info.nPage = m_pageSize;
-  info.nMin = 0;
-  info.nMax = range1;
-  info.nPos = position;
-
-  info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
-
-  ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, refresh);
-#else
-  ::SetScrollPos((HWND)m_hWnd, SB_CTL, position, refresh);
-  ::SetScrollRange((HWND)m_hWnd, SB_CTL, 0, range1, refresh);
-#endif
+    m_viewSize = pageSize;
+    m_pageSize = thumbSize;
+    m_objectSize = range;
+
+    // The range (number of scroll steps) is the
+    // object length minus the page size.
+    int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
+
+    // Try to adjust the range to cope with page size > 1
+    // (see comment for SetPageLength)
+    if ( m_pageSize > 1 )
+    {
+        range1 += (m_pageSize - 1);
+    }
+
+    SCROLLINFO info;
+    info.cbSize = sizeof(SCROLLINFO);
+    info.nPage = m_pageSize;
+    info.nMin = 0;
+    info.nMax = range1;
+    info.nPos = position;
+
+    info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
+
+    ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, refresh);

 }
 
 void wxScrollBar::Command(wxCommandEvent& event)
 }
 
 void wxScrollBar::Command(wxCommandEvent& event)


@@ -344,16 +293,13 @@ WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
     return msStyle;
 }
 

-WXHBRUSH wxScrollBar::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
+WXHBRUSH wxScrollBar::MSWControlColor(WXHDC pDC, WXHWND hWnd)

 {
 {

-    HDC hdc = (HDC)pDC;
-    if ( m_hasFgCol )
-    {
-        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
-    }
-
-    WXHBRUSH hbr = 0;
-    return hbr;
+    // unless we have an explicitly set bg colour, use default (gradient under
+    // XP) brush instead of GetBackgroundColour() one as the base class would
+    //
+    // note that fg colour isn't used for a scrollbar
+    return UseBgCol() ? wxControl::MSWControlColor(pDC, hWnd) : NULL;

 }
 
 #endif // wxUSE_SCROLLBAR
 }
 
 #endif // wxUSE_SCROLLBAR