X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..6a44bffd1ac68163e4c1cfe8aa8fe4f7f98a02e7:/src/msw/scrolbar.cpp?ds=inline diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index 607c116a1e..5cfec12c46 100644 --- a/src/msw/scrolbar.cpp +++ b/src/msw/scrolbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.cpp +// Name: msw/scrolbar.cpp // Purpose: wxScrollBar // Author: Julian Smart // Modified by: @@ -10,19 +10,20 @@ ///////////////////////////////////////////////////////////////////////////// #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__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_SCROLLBAR + #ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/utils.h" + #include "wx/utils.h" #endif #include "wx/scrolbar.h" @@ -81,11 +82,16 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, 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 | WS_CHILD | WS_VISIBLE, + _direction | wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); @@ -352,3 +358,5 @@ void wxScrollBar::OnScroll(wxScrollEvent& event) } } #endif + +#endif // wxUSE_SCROLLBAR