X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/720afa24b0831889e2b2f1fefc21af566949d45c..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/msw/scrolbar.cpp diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index 9c9da3082d..33b0a0c581 100644 --- 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: @@ -9,10 +9,6 @@ // 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" @@ -22,69 +18,14 @@ #if wxUSE_SCROLLBAR +#include "wx/scrolbar.h" + #ifndef WX_PRECOMP #include "wx/utils.h" + #include "wx/settings.h" #endif -#include "wx/scrolbar.h" #include "wx/msw/private.h" -#include "wx/settings.h" - -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxScrollBarStyle ) - -wxBEGIN_FLAGS( wxScrollBarStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxSB_HORIZONTAL) - wxFLAGS_MEMBER(wxSB_VERTICAL) - -wxEND_FLAGS( wxScrollBarStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h") - -wxBEGIN_PROPERTIES_TABLE(wxScrollBar) - wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , 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( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxScrollBar) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_5( wxScrollBar , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) -#else -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) -#endif // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, @@ -109,113 +50,75 @@ wxScrollBar::~wxScrollBar(void) } 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; + // 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.fMask = SIF_RANGE | SIF_POS | SIF_TRACKPOS; - wxUnusedVar(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); -#endif // __WIN95__ + int position = scrollInfo.nPos; wxEventType scrollEvent = wxEVT_NULL; - - int nScrollInc; switch ( wParam ) { - case SB_BOTTOM: - nScrollInc = maxPos - position; + case SB_TOP: + position = 0; scrollEvent = wxEVT_SCROLL_TOP; break; - case SB_TOP: - nScrollInc = -position; + case SB_BOTTOM: + position = maxPos; scrollEvent = wxEVT_SCROLL_BOTTOM; break; case SB_LINEUP: - nScrollInc = -1; + position--; scrollEvent = wxEVT_SCROLL_LINEUP; break; case SB_LINEDOWN: - nScrollInc = 1; + position++; scrollEvent = wxEVT_SCROLL_LINEDOWN; break; case SB_PAGEUP: - nScrollInc = -GetPageSize(); + position -= GetPageSize(); scrollEvent = wxEVT_SCROLL_PAGEUP; break; case SB_PAGEDOWN: - nScrollInc = GetPageSize(); + position += GetPageSize(); scrollEvent = wxEVT_SCROLL_PAGEDOWN; break; case SB_THUMBPOSITION: - nScrollInc = trackPos - position; - scrollEvent = wxEVT_SCROLL_THUMBRELEASE; - break; - 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: - nScrollInc = 0; - scrollEvent = wxEVT_SCROLL_ENDSCROLL; + scrollEvent = wxEVT_SCROLL_CHANGED; break; - - default: - nScrollInc = 0; } - if ( nScrollInc ) + if ( position != scrollInfo.nPos ) { - position += nScrollInc; - if ( position < 0 ) position = 0; if ( position > maxPos ) @@ -224,7 +127,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, 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. @@ -236,12 +139,11 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, event.SetPosition(position); event.SetEventObject( this ); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } void wxScrollBar::SetThumbPosition(int viewStart) { -#if defined(__WIN95__) SCROLLINFO info; info.cbSize = sizeof(SCROLLINFO); info.nPage = 0; @@ -250,59 +152,48 @@ void wxScrollBar::SetThumbPosition(int viewStart) 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 { - SCROLLINFO scrollInfo; - wxZeroMemory(scrollInfo); - scrollInfo.cbSize = sizeof(SCROLLINFO); + WinStruct scrollInfo; scrollInfo.fMask = SIF_POS; if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) ) { - wxLogLastError(_T("GetScrollInfo")); + wxLogLastError(wxT("GetScrollInfo")); } return scrollInfo.nPos; -// return ::GetScrollPos((HWND)m_hWnd, SB_CTL); } 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) @@ -325,7 +216,9 @@ wxSize wxScrollBar::DoGetBestSize() const h = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y); } - return wxSize(w, h); + wxSize best(w, h); + CacheBestSize(best); + return best; } WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -342,4 +235,13 @@ WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const return msStyle; } +WXHBRUSH wxScrollBar::MSWControlColor(WXHDC pDC, WXHWND hWnd) +{ + // 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