fixing focus, fixes #11911

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

diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp
index 5eabd63b7dc049a986d26a23867cf70c80ea0785..62643ec98655671311ee14c5ff179cb6926ae1b0 100644 (file)
--- a/src/msw/slider.cpp
+++ b/src/msw/slider.cpp
@@ -183,7 +183,7 @@ wxSlider::Create(wxWindow *parent,
     };
 
     wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),
-                    _T("incompatible slider direction and orientation") );
+                    wxT("incompatible slider direction and orientation") );
 
 
     // initialize everything
@@ -575,7 +575,7 @@ void wxSlider::SetValue(int value)
 {
     ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));
 
-    if ( m_labels )
+    if ( HasFlag(wxSL_VALUE_LABEL) )
     {
         ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).wx_str());
     }
@@ -589,7 +589,7 @@ void wxSlider::SetRange(int minValue, int maxValue)
     ::SendMessage(GetHwnd(), TBM_SETRANGEMIN, TRUE, m_rangeMin);
     ::SendMessage(GetHwnd(), TBM_SETRANGEMAX, TRUE, m_rangeMax);
 
-    if ( m_labels )
+    if ( HasFlag(wxSL_MIN_MAX_LABELS) )
     {
         ::SetWindowText((*m_labels)[SliderLabel_Min],
                         Format(ValueInvertOrNot(m_rangeMin)).wx_str());