* Fix logical error in m_overflow attribute merging

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index d818a6b3a2761cfd55be581843eda6cf16a9f1c2..ba25fe168717c5a9d604919944738eceb0cbaa24 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -59,6 +59,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_NONE;
+

     SetName(name);
 #if wxUSE_VALIDATORS
     SetValidator(validator);
     SetName(name);
 #if wxUSE_VALIDATORS
     SetValidator(validator);


@@ -90,15 +93,12 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
     long msStyle = 0;
     long wstyle = 0;
 
     long msStyle = 0;
     long wstyle = 0;
 

-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
-

     if ( m_windowStyle & wxSL_LABELS )
     {
     if ( m_windowStyle & wxSL_LABELS )
     {

-        msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
+        msStyle |= SS_CENTER;

 
 

-        bool want3D;
-        WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+        WXDWORD exStyle = 0;
+        msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;

 
         m_staticValue = (WXHWND) CreateWindowEx
             (
 
         m_staticValue = (WXHWND) CreateWindowEx
             (


@@ -123,10 +123,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
             );
     }
 
             );
     }
 

-    msStyle = 0;
+    WXDWORD exStyle = 0;

 
 

-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
+    msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;    

 
     if (m_windowStyle & wxSL_VERTICAL)
         msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
     if (m_windowStyle & wxSL_VERTICAL)
         msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;


@@ -154,7 +153,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     HWND scroll_bar = CreateWindowEx
         (
 
     HWND scroll_bar = CreateWindowEx
         (

-            MakeExtendedStyle(m_windowStyle), TRACKBAR_CLASS, wxT(""),
+            exStyle, TRACKBAR_CLASS, wxT(""),

             msStyle,
             0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL
             msStyle,
             0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL