Simple implementation of wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL for MSW

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

diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp
index 275f2bb9099dd9b48c4b610d071452401261cb02..62643ec98655671311ee14c5ff179cb6926ae1b0 100644 (file)
--- a/src/msw/slider.cpp
+++ b/src/msw/slider.cpp
@@ -575,7 +575,7 @@ void wxSlider::SetValue(int value)
 {
     ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(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());
     }
     {
         ::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);
 
     ::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());
     {
         ::SetWindowText((*m_labels)[SliderLabel_Min],
                         Format(ValueInvertOrNot(m_rangeMin)).wx_str());