X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31833fd72f876dac9e2da14f11ca956aea59e59b..5a410e4453e28ee77ee3ad7a407ca71692f9f30f:/src/os2/slider.cpp?ds=sidebyside

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index 68f1a6e8fa..0a6eb8f985 100644
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -204,9 +204,7 @@ bool wxSlider::Create(
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle
-#if wxUSE_VALIDATORS
 , const wxValidator&                rValidator
-#endif
 , const wxString&                   rsName
 )
 {
@@ -286,7 +284,7 @@ bool wxSlider::Create(
     if (m_windowStyle & wxSL_VERTICAL)
         lMsStyle = SLS_VERTICAL | SLS_HOMEBOTTOM | WS_VISIBLE | WS_TABSTOP;
     else
-        lMsStyle = SLS_HORIZONTAL | SLS_HOMELEFT| WS_VISIBLE | WS_TABSTOP;
+        lMsStyle = SLS_HORIZONTAL | SLS_HOMELEFT | WS_VISIBLE | WS_TABSTOP;
 
     if (m_windowStyle & wxCLIP_SIBLINGS)
         lMsStyle |= WS_CLIPSIBLINGS;
@@ -321,7 +319,7 @@ bool wxSlider::Create(
                                                                    ,(ULONG)lMsStyle          // Style flags
                                                                    ,0L, 0L, 0L, 0L           // Origin -- 0 size
                                                                    ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
-                                                                   ,HWND_TOP                 // initial z position
+                                                                   ,HWND_BOTTOM                 // initial z position
                                                                    ,(HMENU)m_windowId       // Window identifier
                                                                    ,&vSlData                 // Slider control data
                                                                    ,NULL                     // no Presentation parameters
@@ -657,10 +655,6 @@ void wxSlider::DoSetSize(
                 int              nNewWidth = wxMax(nMinLen, nMaxLen);
                 int              nValueHeight = nCyf;
 
-                //
-                // The height needs to be a bit bigger under Win95 if using native
-                // 3D effects.
-                //
                 ::WinSetWindowPos( (HWND)m_hStaticValue
                                   ,HWND_TOP
                                   ,(LONG)nXOffset