X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..87df17a11b0017d31c09f767bd921abb27193bee:/src/msw/slider95.cpp diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 77cf291c9f..443bfec956 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -31,7 +31,7 @@ #include "wx/msw/slider95.h" #include "wx/msw/private.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #include #endif @@ -84,11 +84,15 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, int width = size.x; int height = size.y; - long msStyle ; + long msStyle=0 ; + long wstyle=0 ; + + if ( m_windowStyle & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; if ( m_windowStyle & wxSL_LABELS ) { - msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER; + msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER; bool want3D; WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; @@ -100,13 +104,20 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, // Now create min static control wxSprintf(wxBuffer, wxT("%d"), minValue); + wstyle = STATIC_FLAGS; + if ( m_windowStyle & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer, - STATIC_FLAGS, + wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL); } msStyle = 0; + + if ( m_windowStyle & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; + if (m_windowStyle & wxSL_VERTICAL) msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; else @@ -157,8 +168,11 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, { // Finally, create max value static item wxSprintf(wxBuffer, wxT("%d"), maxValue); + wstyle = STATIC_FLAGS; + if ( m_windowStyle & wxCLIP_SIBLINGS ) + msStyle |= WS_CLIPSIBLINGS; m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer, - STATIC_FLAGS, + wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL);