check for error in GetSelection(long *, long *); clean up SetSelect(long, long)

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 8d091ca80aa096866c54d8e232a8798a14ec3574..705ca4bd7f3ae75fdb34c1994c2240d4e696e21c 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -207,6 +207,14 @@ wxSlider95::Create(wxWindow *parent,
     SetValue(value);
     SetPageSize((maxValue - minValue)/10);
 
     SetValue(value);
     SetPageSize((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
+    // MSWCreateControl()) as in this case they haven't been put in place yet
+    if ( m_labels && size.x != wxDefaultCoord && size.y != wxDefaultCoord )
+    {
+        SetSize(size);
+    }
+

     return true;
 }
 
     return true;
 }
 


@@ -338,7 +346,11 @@ wxRect wxSlider95::GetBoundingBox() const
 
     wxRect rect(x, y, w, h);
     if ( m_labels )
 
     wxRect rect(x, y, w, h);
     if ( m_labels )

-        rect.Union(m_labels->GetBoundingBox());
+    {
+        wxRect lrect = m_labels->GetBoundingBox();
+        GetParent()->ScreenToClient(&lrect.x, &lrect.y);
+        rect.Union(lrect);
+    }

 
     return rect;
 }
 
     return rect;
 }


@@ -394,6 +406,9 @@ void wxSlider95::DoMoveWindow(int x, int y, int width, int height)
         return;
     }
 
         return;
     }
 

+    // be careful to position the slider itself after moving the labels as
+    // otherwise our GetBoundingBox(), which is called from WM_SIZE handler,
+    // would return a wrong result and wrong size would be cached internally

     if ( HasFlag(wxSL_VERTICAL) )
     {
         int wLabel;
     if ( HasFlag(wxSL_VERTICAL) )
     {
         int wLabel;


@@ -401,14 +416,6 @@ void wxSlider95::DoMoveWindow(int x, int y, int width, int height)
 
         int xLabel = HasFlag(wxSL_LEFT) ? x + width - wLabel : x;
 
 
         int xLabel = HasFlag(wxSL_LEFT) ? x + width - wLabel : x;
 

-        // position the slider itself along the left/right edge
-        ::MoveWindow(GetHwnd(),
-                     HasFlag(wxSL_LEFT) ? x : x + wLabel + HGAP,
-                     y + hLabel/2,
-                     width - wLabel - HGAP,
-                     height - hLabel,
-                     TRUE);
-

         // position all labels: min at the top, value in the middle and max at
         // the bottom
         ::MoveWindow((*m_labels)[SliderLabel_Min],
         // position all labels: min at the top, value in the middle and max at
         // the bottom
         ::MoveWindow((*m_labels)[SliderLabel_Min],


@@ -419,6 +426,14 @@ void wxSlider95::DoMoveWindow(int x, int y, int width, int height)
 
         ::MoveWindow((*m_labels)[SliderLabel_Max],
                      xLabel, y + height - hLabel, wLabel, hLabel, TRUE);
 
         ::MoveWindow((*m_labels)[SliderLabel_Max],
                      xLabel, y + height - hLabel, wLabel, hLabel, TRUE);

+
+        // position the slider itself along the left/right edge
+        ::MoveWindow(GetHwnd(),
+                     HasFlag(wxSL_LEFT) ? x : x + wLabel + HGAP,
+                     y + hLabel/2,
+                     width - wLabel - HGAP,
+                     height - hLabel,
+                     TRUE);

     }
     else // horizontal
     {
     }
     else // horizontal
     {


@@ -427,14 +442,6 @@ void wxSlider95::DoMoveWindow(int x, int y, int width, int height)
 
         int yLabel = HasFlag(wxSL_TOP) ? y + height - hLabel : y;
 
 
         int yLabel = HasFlag(wxSL_TOP) ? y + height - hLabel : y;
 

-        // position the slider itself along the top/bottom edge
-        ::MoveWindow(GetHwnd(),
-                     x,
-                     HasFlag(wxSL_TOP) ? y : y + hLabel,
-                     width,
-                     height - hLabel,
-                     TRUE);
-

         // position all labels: min on the left, value in the middle and max to
         // the right
         ::MoveWindow((*m_labels)[SliderLabel_Min],
         // position all labels: min on the left, value in the middle and max to
         // the right
         ::MoveWindow((*m_labels)[SliderLabel_Min],


@@ -445,6 +452,14 @@ void wxSlider95::DoMoveWindow(int x, int y, int width, int height)
 
         ::MoveWindow((*m_labels)[SliderLabel_Max],
                      x + width - wLabel, yLabel, wLabel, hLabel, TRUE);
 
         ::MoveWindow((*m_labels)[SliderLabel_Max],
                      x + width - wLabel, yLabel, wLabel, hLabel, TRUE);

+
+        // position the slider itself along the top/bottom edge
+        ::MoveWindow(GetHwnd(),
+                     x,
+                     HasFlag(wxSL_TOP) ? y : y + hLabel,
+                     width,
+                     height - hLabel,
+                     TRUE);

     }
 }
 
     }
 }
 


@@ -609,20 +624,6 @@ WXHWND wxSlider95::GetEditValue() const
     return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;
 }
 
     return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;
 }
 

-bool wxSlider95::ContainsHWND(WXHWND hWnd) const
-{
-    return m_labels && m_labels->HasWindow((HWND)hWnd);
-}
-
-bool wxSlider95::Show(bool show)
-{
-    if ( !wxSliderBase::Show(show) )
-        return false;
-
-    if ( m_labels )
-        m_labels->Show(show);
-
-    return true;
-}
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider95, wxSliderBase, m_labels)

 
 #endif // wxUSE_SLIDER
 
 #endif // wxUSE_SLIDER