make the label window visible (patch 1013447)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 225702cb62fb766468ee234a0214ec51c3c8c834..4187123630beb5b457efb5adef6683f749bc04a3 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 )
     {
 
     if ( m_windowStyle & wxSL_LABELS )
     {

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

 
         WXDWORD exStyle = 0;
         long valueStyle = m_windowStyle & ~wxBORDER_MASK;
 
         WXDWORD exStyle = 0;
         long valueStyle = m_windowStyle & ~wxBORDER_MASK;


@@ -830,20 +830,16 @@ bool wxSlider95::Show(bool show)
 {
     wxWindow::Show(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)
 
     if(m_staticValue)

-        ShowWindow((HWND) m_staticValue, (BOOL)cshow);
+        ShowWindow((HWND) m_staticValue, cshow);

 
     if(m_staticMin)
 
     if(m_staticMin)

-        ShowWindow((HWND) m_staticMin, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMin, cshow);

 
     if(m_staticMax)
 
     if(m_staticMax)

-        ShowWindow((HWND) m_staticMax, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMax, cshow);

 
     return true;
 }
 
     return true;
 }