applied patch for compilation with gcc 3.0

[wxWidgets.git] / src / msw / slidrmsw.cpp

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 4050e2c1a41abce91726c57dc51c73890dbaea7f..2f270845344c123d5e4f45bee54fc5bc11dfef57 100644 (file)
--- 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;
 
   
   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) ;
 
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 


@@ -92,8 +95,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
 
   // Now create min static control
   wxSprintf(wxBuffer, wxT("%d"), minValue);
 
   // 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,
   m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,

-                         STATIC_FLAGS,
+                         wstyle,

                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 


@@ -123,8 +129,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
 
   // Finally, create max value static item
   wxSprintf(wxBuffer, wxT("%d"), maxValue);
 
   // 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,
   m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,

-                         STATIC_FLAGS,
+                         wstyle,

                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);