X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11b6a93b1e078fea5bf49ed9e6628a19849c11b3..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/msw/slidrmsw.cpp

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 7aa2ccfe03..2f27084534 100644
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -82,6 +82,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   
   long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
 
+   if ( m_windowStyle & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
@@ -92,14 +95,14 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
 
   // Now create min static control
   wxSprintf(wxBuffer, wxT("%d"), minValue);
+  DWORD wstyle = STATIC_FLAGS;
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
   m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
-                         STATIC_FLAGS,
+                         wstyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 
-  // Now create slider
-  m_windowId = (int)NewControlId();
-
   msStyle = 0;
   if (m_windowStyle & wxSL_VERTICAL)
     msStyle = SBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
@@ -126,8 +129,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
 
   // Finally, create max value static item
   wxSprintf(wxBuffer, wxT("%d"), maxValue);
+  wstyle = STATIC_FLAGS;
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
   m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
-                         STATIC_FLAGS,
+                         wstyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 
@@ -231,6 +237,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     GetEventHandler()->ProcessEvent(event);
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+    cevent.SetInt( newPos );
     cevent.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent( cevent );