X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..08bce50191228ae4a423b488beedcc8ef1ebb30c:/src/msw/scrolbar.cpp diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index d10d08daad..20a45e346b 100644 --- a/src/msw/scrolbar.cpp +++ b/src/msw/scrolbar.cpp @@ -1,18 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/scrolbar.cpp +// Name: src/msw/scrolbar.cpp // 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__ - #pragma implementation "scrolbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,15 +24,63 @@ #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_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( 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) - -BEGIN_EVENT_TABLE(wxScrollBar, wxControl) -#if WXWIN_COMPATIBILITY - EVT_SCROLL(wxScrollBar::OnScroll) #endif -END_EVENT_TABLE() - // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, @@ -45,74 +89,15 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - if (!parent) - return FALSE; - parent->AddChild(this); - SetName(name); -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif // wxUSE_VALIDATORS - - SetBackgroundColour(parent->GetBackgroundColour()) ; - SetForegroundColour(parent->GetForegroundColour()) ; - m_windowStyle = style; - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - if (width == -1) - { - if (style & wxHORIZONTAL) - width = 140; - else - width = 14; - } - if (height == -1) - { - if (style & wxVERTICAL) - height = 140; - else - height = 14; - } - - DWORD wstyle = WS_VISIBLE | WS_CHILD; - - if ( m_windowStyle & wxCLIP_SIBLINGS ) - wstyle |= WS_CLIPSIBLINGS; - - // Now create scrollbar - DWORD _direction = (style & wxHORIZONTAL) ? - SBS_HORZ: SBS_VERT; - HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(style), wxT("SCROLLBAR"), wxT("scrollbar"), - _direction | wstyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, - wxGetInstance(), NULL); - - m_pageSize = 1; - m_viewSize = 1; - m_objectSize = 1; - - ::SetScrollRange(scroll_bar, SB_CTL, 0, 1, FALSE); - ::SetScrollPos(scroll_bar, SB_CTL, 0, FALSE); - ShowWindow(scroll_bar, SW_SHOW); + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) + return false; - SetFont(parent->GetFont()); + if (!MSWCreateControl(wxT("ScrollBar"), wxEmptyString, pos, size)) + return false; - m_hWnd = (WXHWND)scroll_bar; + SetScrollbar(0, 1, 2, 1, false); - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND) scroll_bar); - - SetSize(x, y, width, height); - - return TRUE; + return true; } wxScrollBar::~wxScrollBar(void) @@ -120,16 +105,19 @@ wxScrollBar::~wxScrollBar(void) } bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, - WXWORD pos, WXHWND control) + WXWORD pos, WXHWND WXUNUSED(control)) { // current and max positions int position, maxPos, trackPos = pos; -#ifdef __WIN32__ + wxUnusedVar(trackPos); + // when we're dragging the scrollbar we can't use pos parameter because it // is limited to 16 bits - if ( wParam == SB_THUMBPOSITION || wParam == SB_THUMBTRACK ) + // JACS: now always using GetScrollInfo, since there's no reason + // not to +// if ( wParam == SB_THUMBPOSITION || wParam == SB_THUMBTRACK ) { SCROLLINFO scrollInfo; wxZeroMemory(scrollInfo); @@ -149,21 +137,20 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, position = scrollInfo.nPos; maxPos = scrollInfo.nMax; } +#if 0 else -#endif // Win32 { 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 // 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; @@ -212,7 +199,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, case SB_ENDSCROLL: nScrollInc = 0; - scrollEvent = wxEVT_SCROLL_ENDSCROLL; + scrollEvent = wxEVT_SCROLL_CHANGED; break; default: @@ -231,14 +218,15 @@ 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. - return FALSE; + return false; } wxScrollEvent event(scrollEvent, m_windowId); + event.SetOrientation(IsVertical() ? wxVERTICAL : wxHORIZONTAL); event.SetPosition(position); event.SetEventObject( this ); @@ -247,7 +235,6 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, void wxScrollBar::SetThumbPosition(int viewStart) { -#if defined(__WIN95__) SCROLLINFO info; info.cbSize = sizeof(SCROLLINFO); info.nPage = 0; @@ -256,147 +243,99 @@ 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 { - 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, 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, TRUE); - ::SetScrollRange((HWND)m_hWnd, SB_CTL, 0, range1, TRUE); -#endif -} - + m_viewSize = pageSize; + m_pageSize = thumbSize; + m_objectSize = range; -/* From the WIN32 documentation: -In version 4.0 or later, the maximum value that a scroll bar can report -(that is, the maximum scrolling position) depends on the page size. -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: + // The range (number of scroll steps) is the + // object length minus the page size. + int range1 = wxMax((m_objectSize - m_pageSize), 0) ; -MaxScrollPos = MaxRangeValue - (PageSize - 1) -*/ + // Try to adjust the range to cope with page size > 1 + // (see comment for SetPageLength) + if ( m_pageSize > 1 ) + { + range1 += (m_pageSize - 1); + } -#if WXWIN_COMPATIBILITY -void wxScrollBar::SetPageSize(int pageLength) -{ - m_pageSize = pageLength; + SCROLLINFO info; + info.cbSize = sizeof(SCROLLINFO); + info.nPage = m_pageSize; + info.nMin = 0; + info.nMax = range1; + info.nPos = position; -#if defined(__WIN95__) - SCROLLINFO info; - info.cbSize = sizeof(SCROLLINFO); - info.nPage = pageLength; - info.fMask = SIF_PAGE ; + info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; - ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE); -#endif + ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, refresh); } -void wxScrollBar::SetObjectLength(int objectLength) +void wxScrollBar::Command(wxCommandEvent& event) { - m_objectSize = objectLength; - - // The range (number of scroll steps) is the - // object length minus the view size. - int range = wxMax((objectLength - m_viewSize), 0) ; - -#if defined(__WIN95__) - // Try to adjust the range to cope with page size > 1 - // (see comment for SetPageLength) - if ( m_pageSize > 1 ) - { - range += (m_pageSize - 1); - } - - SCROLLINFO info; - info.cbSize = sizeof(SCROLLINFO); - info.nPage = 0; - info.nMin = 0; - info.nMax = range; - info.nPos = 0; - info.fMask = SIF_RANGE ; - - ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE); -#else - ::SetScrollRange((HWND)m_hWnd, SB_CTL, 0, range, TRUE); -#endif + SetThumbPosition(event.GetInt()); + ProcessCommand(event); } -void wxScrollBar::SetViewLength(int viewLength) +wxSize wxScrollBar::DoGetBestSize() const { - m_viewSize = viewLength; -} + int w = 100; + int h = 100; -void wxScrollBar::GetValues(int *viewStart, int *viewLength, int *objectLength, - int *pageLength) const -{ - *viewStart = ::GetScrollPos((HWND)m_hWnd, SB_CTL); - *viewLength = m_viewSize; - *objectLength = m_objectSize; - *pageLength = m_pageSize; -} -#endif + if ( IsVertical() ) + { + w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + } + else + { + h = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y); + } -WXHBRUSH wxScrollBar::OnCtlColor(WXHDC WXUNUSED(pDC), WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), - WXUINT WXUNUSED(message), WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam)) -{ - return 0; + wxSize best(w, h); + CacheBestSize(best); + return best; } -void wxScrollBar::Command(wxCommandEvent& event) +WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const { - SetThumbPosition(event.m_commandInt); - ProcessCommand(event); + // we never have an external border + WXDWORD msStyle = wxControl::MSWGetStyle + ( + (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle + ); + + // SBS_HORZ is 0 anyhow, but do mention it explicitly for clarity + msStyle |= style & wxSB_HORIZONTAL ? SBS_HORZ : SBS_VERT; + + return msStyle; } -#if WXWIN_COMPATIBILITY -// Backward compatibility -void wxScrollBar::OnScroll(wxScrollEvent& event) +WXHBRUSH wxScrollBar::MSWControlColor(WXHDC pDC, WXHWND hWnd) { - wxEventType oldEvent = event.GetEventType(); - event.SetEventType( wxEVT_COMMAND_SCROLLBAR_UPDATED ); - if ( !GetEventHandler()->ProcessEvent(event) ) - { - event.SetEventType( oldEvent ); - if (!GetParent()->GetEventHandler()->ProcessEvent(event)) - event.Skip(); - } + // 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 #endif // wxUSE_SCROLLBAR