From 5db9025368736064284d2c80f56f341ab6fd2261 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 11 Jul 2011 22:49:30 +0000 Subject: [PATCH] No real changes, just make some wxSlider members local variables. wxMSW wxSlider implementation stored the min and max labels widths as fields of wxSlider object for some reason even though they were only used in one of its methods (and can be easily computed anyhow). Make them simple local variables instead and also rename an existing local variable which started conflicting with their new names. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/slider.h | 2 -- src/msw/slider.cpp | 56 +++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h index abd4ec4985..d6c2400cd3 100644 --- a/include/wx/msw/slider.h +++ b/include/wx/msw/slider.h @@ -123,8 +123,6 @@ protected: int m_pageSize; int m_lineSize; int m_tickFreq; - int m_minLabelWidth; - int m_maxLabelWidth; // flag needed to detect whether we're getting THUMBRELEASE event because // of dragging the thumb or scrolling the mouse wheel diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp index ae7b2b38a9..b2df912ba1 100644 --- a/src/msw/slider.cpp +++ b/src/msw/slider.cpp @@ -394,8 +394,10 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) return; } - const int labelHeight = GetLabelsSize(&m_minLabelWidth, &m_maxLabelWidth); - const int maxLabelWidth = wxMax(m_minLabelWidth, m_maxLabelWidth); + int minLabelWidth, + maxLabelWidth; + const int labelHeight = GetLabelsSize(&minLabelWidth, &maxLabelWidth); + const int longestLabelWidth = wxMax(minLabelWidth, maxLabelWidth); int labelOffset = 0; int tickOffset = 0; @@ -413,16 +415,16 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) int holdTopX; int holdBottomWidth; int holdBottomX; - int xLabel = (wxMax((THUMB + (BORDERPAD * 2)), maxLabelWidth) / 2) - - (maxLabelWidth / 2) + x; + int xLabel = (wxMax((THUMB + (BORDERPAD * 2)), longestLabelWidth) / 2) - + (longestLabelWidth / 2) + x; if ( HasFlag(wxSL_LEFT) ) { if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { holdTopX = xLabel; - holdTopWidth = m_minLabelWidth; - holdBottomX = xLabel - ((m_maxLabelWidth - m_minLabelWidth) / 2); - holdBottomWidth = m_maxLabelWidth; + holdTopWidth = minLabelWidth; + holdBottomX = xLabel - ((maxLabelWidth - minLabelWidth) / 2); + holdBottomWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdTopWidth, holdBottomWidth); @@ -441,16 +443,16 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], x + THUMB + tickOffset + HGAP, y + (height - labelHeight)/2, - maxLabelWidth, labelHeight); + longestLabelWidth, labelHeight); } else // wxSL_RIGHT { if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { - holdTopX = xLabel + maxLabelWidth + ((m_maxLabelWidth - m_minLabelWidth) / 2); - holdTopWidth = m_minLabelWidth; - holdBottomX = xLabel + maxLabelWidth; - holdBottomWidth = m_maxLabelWidth; + holdTopX = xLabel + longestLabelWidth + ((maxLabelWidth - minLabelWidth) / 2); + holdTopWidth = minLabelWidth; + holdBottomX = xLabel + longestLabelWidth; + holdBottomWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdTopWidth, holdBottomWidth); @@ -466,11 +468,11 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) holdBottomWidth, labelHeight); } if ( HasFlag(wxSL_VALUE_LABEL) ) - labelOffset = maxLabelWidth + HGAP; + labelOffset = longestLabelWidth + HGAP; DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], x, y + (height - labelHeight)/2, - maxLabelWidth, labelHeight); + longestLabelWidth, labelHeight); } // position the slider itself along the left/right edge @@ -489,9 +491,9 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) int yLabelMinMax = (y + ((THUMB + tickOffset) / 2)) - (labelHeight / 2); int xLabelValue = - x + m_minLabelWidth + - ((width - (m_minLabelWidth + m_maxLabelWidth)) / 2) - - (m_maxLabelWidth / 2); + x + minLabelWidth + + ((width - (minLabelWidth + maxLabelWidth)) / 2) - + (maxLabelWidth / 2); int ySlider = y; @@ -502,7 +504,7 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], xLabelValue, y, - maxLabelWidth, labelHeight); + longestLabelWidth, labelHeight); ySlider += labelHeight; yLabelMinMax += labelHeight; @@ -511,9 +513,9 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { holdLeftX = x; - holdLeftWidth = m_minLabelWidth; - holdRightX = x + width - m_maxLabelWidth; - holdRightWidth = m_maxLabelWidth; + holdLeftWidth = minLabelWidth; + holdRightX = x + width - maxLabelWidth; + holdRightWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdLeftWidth, holdRightWidth); @@ -536,15 +538,15 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value], xLabelValue, y + THUMB + tickOffset, - maxLabelWidth, labelHeight); + longestLabelWidth, labelHeight); } if ( HasFlag(wxSL_MIN_MAX_LABELS) ) { holdLeftX = x; - holdLeftWidth = m_minLabelWidth; - holdRightX = x + width - m_maxLabelWidth; - holdRightWidth = m_maxLabelWidth; + holdLeftWidth = minLabelWidth; + holdRightX = x + width - maxLabelWidth; + holdRightWidth = maxLabelWidth; if ( HasFlag(wxSL_INVERSE) ) { wxSwap(holdLeftWidth, holdRightWidth); @@ -565,9 +567,9 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height) if ( HasFlag(wxSL_MIN_MAX_LABELS) || HasFlag(wxSL_VALUE_LABEL) ) labelOffset = labelHeight; wxSliderBase::DoMoveWindow( - x + m_minLabelWidth + VGAP, + x + minLabelWidth + VGAP, ySlider, - width - (m_minLabelWidth + m_maxLabelWidth + (VGAP*2)), + width - (minLabelWidth + maxLabelWidth + (VGAP*2)), THUMB + tickOffset); } } -- 2.45.2