X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..efb27c04d3045a6db679ec14c6a88b1d2276665d:/src/msw/scrolbar.cpp diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index 820c1fb0d5..d892916568 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,13 +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 ) @@ -42,7 +39,7 @@ wxBEGIN_FLAGS( wxScrollBarStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -69,12 +66,12 @@ 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 ) + 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( 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() @@ -90,78 +87,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, - const wxValidator& wxVALIDATOR_PARAM(validator), + const wxValidator& validator, const wxString& name) { - if (!parent) - return FALSE; - parent->AddChild(this); - SetName(name); -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif // wxUSE_VALIDATORS - - if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT) - style |= wxNO_BORDER; - - 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; - } - - WXDWORD exStyle = 0; - WXDWORD wstyle = MSWGetStyle(style, & exStyle) ; + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) + return false; - // Now create scrollbar - DWORD _direction = (style & wxHORIZONTAL) ? - SBS_HORZ: SBS_VERT; - HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxT("scrollbar"), - _direction | wstyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, - wxGetInstance(), NULL); + if (!MSWCreateControl(wxT("ScrollBar"), wxEmptyString, pos, size)) + return false; - m_pageSize = 1; - m_viewSize = 1; - m_objectSize = 1; + SetScrollbar(0, 1, 2, 1, false); - ::SetScrollRange(scroll_bar, SB_CTL, 0, 1, FALSE); - ::SetScrollPos(scroll_bar, SB_CTL, 0, FALSE); - ShowWindow(scroll_bar, SW_SHOW); - - SetFont(parent->GetFont()); - - m_hWnd = (WXHWND)scroll_bar; - - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND) scroll_bar); - - SetSize(x, y, width, height); - - return TRUE; + return true; } wxScrollBar::~wxScrollBar(void) @@ -175,6 +112,8 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, int position, maxPos, trackPos = pos; + 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 @@ -208,25 +147,23 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, } #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; int nScrollInc; switch ( wParam ) { - case SB_BOTTOM: + case SB_TOP: nScrollInc = maxPos - position; scrollEvent = wxEVT_SCROLL_TOP; break; - case SB_TOP: + case SB_BOTTOM: nScrollInc = -position; scrollEvent = wxEVT_SCROLL_BOTTOM; break; @@ -263,7 +200,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, case SB_ENDSCROLL: nScrollInc = 0; - scrollEvent = wxEVT_SCROLL_ENDSCROLL; + scrollEvent = wxEVT_SCROLL_CHANGED; break; default: @@ -282,11 +219,11 @@ 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); @@ -299,7 +236,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; @@ -308,9 +244,6 @@ 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 @@ -331,48 +264,36 @@ int wxScrollBar::GetThumbPosition(void) const 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; + // The range (number of scroll steps) is the + // object length minus the page size. + int range1 = wxMax((m_objectSize - m_pageSize), 0) ; -WXHBRUSH wxScrollBar::OnCtlColor(WXHDC WXUNUSED(pDC), WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), - WXUINT WXUNUSED(message), WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam)) -{ - return 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) { - SetThumbPosition(event.m_commandInt); + SetThumbPosition(event.GetInt()); ProcessCommand(event); } @@ -390,7 +311,32 @@ 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 +{ + // 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; +} + +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