missing commit

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

diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp
index d7b2d7cf9e9e425ca74314fe71595ef0039ba6a5..8b905b1fa5acdfe71f165f753b2b9fa4401eb6fe 100644 (file)
--- a/src/msw/slider.cpp
+++ b/src/msw/slider.cpp
@@ -175,7 +175,7 @@ bool wxSlider::Create(wxWindow *parent,
     // and initialize everything
     SetRange(minValue, maxValue);
     SetValue(value);
     // and initialize everything
     SetRange(minValue, maxValue);
     SetValue(value);

-    SetPageSize((maxValue - minValue)/10);
+    SetPageSize( wxMax(1, (maxValue - minValue)/10) );

 
     // we need to position the labels correctly if we have them and if
     // SetSize() hadn't been called before (when best size was determined by
 
     // we need to position the labels correctly if we have them and if
     // SetSize() hadn't been called before (when best size was determined by


@@ -310,7 +310,7 @@ bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
     event.SetEventObject( this );
     HandleWindowEvent(event);
 
     event.SetEventObject( this );
     HandleWindowEvent(event);
 

-    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+    wxCommandEvent cevent( wxEVT_SLIDER, GetId() );

     cevent.SetInt( newPos );
     cevent.SetEventObject( this );
 
     cevent.SetInt( newPos );
     cevent.SetEventObject( this );
 


@@ -401,7 +401,6 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height)
         maxLabelWidth = 0;
     }
 
         maxLabelWidth = 0;
     }
 

-    int labelOffset =  0;

     int tickOffset = 0;
     if ( HasFlag(wxSL_TICKS))
        tickOffset = TICK;
     int tickOffset = 0;
     if ( HasFlag(wxSL_TICKS))
        tickOffset = TICK;


@@ -413,68 +412,47 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height)
     // would return a wrong result and wrong size would be cached internally
     if ( HasFlag(wxSL_VERTICAL) )
     {
     // would return a wrong result and wrong size would be cached internally
     if ( HasFlag(wxSL_VERTICAL) )
     {

-        int holdTopWidth;
+        int labelOffset =  0;

         int holdTopX;
         int holdTopX;

-        int holdBottomWidth;

         int holdBottomX;
         int xLabel = (wxMax((THUMB + (BORDERPAD * 2)), longestLabelWidth) / 2) -
             (longestLabelWidth / 2) + x;
         if ( HasFlag(wxSL_LEFT) )
         {
         int holdBottomX;
         int xLabel = (wxMax((THUMB + (BORDERPAD * 2)), longestLabelWidth) / 2) -
             (longestLabelWidth / 2) + x;
         if ( HasFlag(wxSL_LEFT) )
         {

-            if ( HasFlag(wxSL_MIN_MAX_LABELS) )
-            {
-                holdTopX = xLabel;
-                holdTopWidth = minLabelWidth;
-                holdBottomX = xLabel - (abs(maxLabelWidth - minLabelWidth) / 2);
-                holdBottomWidth = maxLabelWidth;
-                if ( HasFlag(wxSL_INVERSE) )
-                {
-                    wxSwap(holdTopX, holdBottomX);
-                }
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                    holdTopX,
-                    y,
-                    holdTopWidth, labelHeight);
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                    holdBottomX,
-                    y + height - labelHeight,
-                    holdBottomWidth, labelHeight);
-            }
-            if ( HasFlag(wxSL_VALUE_LABEL) )
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                    x + THUMB + tickOffset + HGAP,
-                    y + (height - labelHeight)/2,
-                    longestLabelWidth, labelHeight);
+            holdTopX = xLabel;
+            holdBottomX = xLabel - (abs(maxLabelWidth - minLabelWidth) / 2);

         }
         else // wxSL_RIGHT
         {
         }
         else // wxSL_RIGHT
         {

-            if ( HasFlag(wxSL_MIN_MAX_LABELS) )
+            holdTopX = xLabel + longestLabelWidth + (abs(maxLabelWidth - minLabelWidth) / 2);
+            holdBottomX = xLabel + longestLabelWidth;
+
+            labelOffset = longestLabelWidth + HGAP;
+        }
+
+        if ( HasFlag(wxSL_MIN_MAX_LABELS) )
+        {
+            if ( HasFlag(wxSL_INVERSE) )

             {
             {

-                holdTopX = xLabel + longestLabelWidth + (abs(maxLabelWidth - minLabelWidth) / 2);
-                holdTopWidth = minLabelWidth;
-                holdBottomX = xLabel + longestLabelWidth;
-                holdBottomWidth = maxLabelWidth;
-                if ( HasFlag(wxSL_INVERSE) )
-                {
-                    wxSwap(holdTopX, holdBottomX);
-                }
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                    holdTopX,
-                    y,
-                    holdTopWidth, labelHeight);
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                    holdBottomX,
-                    y + height - labelHeight,
-                    holdBottomWidth, labelHeight);
+                wxSwap(holdTopX, holdBottomX);

             }
             }

-            if ( HasFlag(wxSL_VALUE_LABEL) )
-            {
-                labelOffset = longestLabelWidth + HGAP;
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                x,
+
+            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
+                holdTopX,
+                y,
+                minLabelWidth, labelHeight);
+            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
+                holdBottomX,
+                y + height - labelHeight,
+                maxLabelWidth, labelHeight);
+        }
+
+        if ( HasFlag(wxSL_VALUE_LABEL) )
+        {
+            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
+                x + ( HasFlag(wxSL_LEFT) ? THUMB + tickOffset + HGAP : 0 ),

                 y + (height - labelHeight)/2,
                 longestLabelWidth, labelHeight);
                 y + (height - labelHeight)/2,
                 longestLabelWidth, labelHeight);

-            }

         }
 
         // position the slider itself along the left/right edge
         }
 
         // position the slider itself along the left/right edge


@@ -486,10 +464,6 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height)
     }
     else // horizontal
     {
     }
     else // horizontal
     {

-        int holdLeftWidth;
-        int holdLeftX;
-        int holdRightWidth;
-        int holdRightX;

         int yLabelMinMax =
             (y + ((THUMB + tickOffset) / 2)) - (labelHeight / 2);
         int xLabelValue =
         int yLabelMinMax =
             (y + ((THUMB + tickOffset) / 2)) - (labelHeight / 2);
         int xLabelValue =


@@ -499,60 +473,30 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height)
 
         int ySlider = y;
 
 
         int ySlider = y;
 

-        if ( HasFlag(wxSL_BOTTOM) )
+        if ( HasFlag(wxSL_VALUE_LABEL) )

         {
         {

-            if ( HasFlag(wxSL_VALUE_LABEL) )
-            {
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                    xLabelValue,
-                    y,
-                    longestLabelWidth, labelHeight);
+            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
+                xLabelValue,
+                y + (HasFlag(wxSL_BOTTOM) ? 0 : THUMB + tickOffset),
+                longestLabelWidth, labelHeight);

 
 

+            if ( HasFlag(wxSL_BOTTOM) )
+            {

                 ySlider += labelHeight;
                 yLabelMinMax += labelHeight;
             }
                 ySlider += labelHeight;
                 yLabelMinMax += labelHeight;
             }

-
-            if ( HasFlag(wxSL_MIN_MAX_LABELS) )
-            {
-                holdLeftX = x;
-                holdLeftWidth = minLabelWidth;
-                holdRightX = x + width - maxLabelWidth;
-                holdRightWidth = maxLabelWidth;
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                    holdLeftX,
-                    yLabelMinMax,
-                    holdLeftWidth, labelHeight);
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                    holdRightX,
-                    yLabelMinMax,
-                    holdRightWidth, labelHeight);
-            }

         }
         }

-        else // wxSL_TOP
-        {
-            if ( HasFlag(wxSL_VALUE_LABEL) )
-            {
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                    xLabelValue,
-                    y + THUMB + tickOffset,
-                    longestLabelWidth, labelHeight);
-            }

 
 

-            if ( HasFlag(wxSL_MIN_MAX_LABELS) )
-            {
-                holdLeftX = x;
-                holdLeftWidth = minLabelWidth;
-                holdRightX = x + width - maxLabelWidth;
-                holdRightWidth = maxLabelWidth;
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                    holdLeftX,
-                    yLabelMinMax,
-                    holdLeftWidth, labelHeight);
-                DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                    holdRightX,
-                    yLabelMinMax,
-                    holdRightWidth, labelHeight);
-            }
+        if ( HasFlag(wxSL_MIN_MAX_LABELS) )
+        {
+            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
+                x,
+                yLabelMinMax,
+                minLabelWidth, labelHeight);
+            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
+                x + width - maxLabelWidth,
+                yLabelMinMax,
+                maxLabelWidth, labelHeight);

         }
 
         // position the slider itself along the top/bottom edge
         }
 
         // position the slider itself along the top/bottom edge


@@ -639,7 +583,7 @@ void wxSlider::SetValue(int value)
 
     if ( m_labels )
     {
 
     if ( m_labels )
     {

-        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).wx_str());
+        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).t_str());

     }
 }
 
     }
 }
 


@@ -659,9 +603,9 @@ void wxSlider::SetRange(int minValue, int maxValue)
     if ( m_labels )
     {
         ::SetWindowText((*m_labels)[SliderLabel_Min],
     if ( m_labels )
     {
         ::SetWindowText((*m_labels)[SliderLabel_Min],

-                        Format(ValueInvertOrNot(m_rangeMin)).wx_str());
+                        Format(ValueInvertOrNot(m_rangeMin)).t_str());

         ::SetWindowText((*m_labels)[SliderLabel_Max],
         ::SetWindowText((*m_labels)[SliderLabel_Max],

-                        Format(ValueInvertOrNot(m_rangeMax)).wx_str());
+                        Format(ValueInvertOrNot(m_rangeMax)).t_str());

     }
 
     // When emulating wxSL_INVERSE style in wxWidgets, we need to update the
     }
 
     // When emulating wxSL_INVERSE style in wxWidgets, we need to update the