reverted, the problem is deeper than that

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 225702cb62fb766468ee234a0214ec51c3c8c834..b6c68e1628cb4f4f22e9b859882c88ef2d02e34c 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -147,7 +147,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     if ( m_windowStyle & wxSL_LABELS )
     {
-        msStyle |= SS_CENTER;
+        msStyle |= SS_CENTER|WS_VISIBLE;
 
         WXDWORD exStyle = 0;
         long valueStyle = m_windowStyle & ~wxBORDER_MASK;
@@ -722,20 +722,6 @@ void wxSlider95::SetRange(int minValue, int maxValue)
     }
 }
 
-WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#ifndef __WXWINCE__
-    if ( nCtlColor == CTLCOLOR_SCROLLBAR )
-        return 0;
-#else
-    if ( nCtlColor != CTLCOLOR_STATIC )
-        return 0;
-#endif
-    // Otherwise, it's a static
-    return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
-}
-
 // For trackbars only
 void wxSlider95::SetTickFreq(int n, int pos)
 {
@@ -830,20 +816,16 @@ bool wxSlider95::Show(bool show)
 {
     wxWindow::Show(show);
 
-    int cshow;
-    if (show)
-        cshow = SW_SHOW;
-    else
-        cshow = SW_HIDE;
+    int cshow = show ? SW_SHOW : SW_HIDE;
 
     if(m_staticValue)
-        ShowWindow((HWND) m_staticValue, (BOOL)cshow);
+        ShowWindow((HWND) m_staticValue, cshow);
 
     if(m_staticMin)
-        ShowWindow((HWND) m_staticMin, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMin, cshow);
 
     if(m_staticMax)
-        ShowWindow((HWND) m_staticMax, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMax, cshow);
 
     return true;
 }