X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac8d0c118b7403e2838e75124b442051299e6f6c..e3f9e20cb15c62bd347a8e52d2d36529adbdb3d6:/src/msw/slider95.cpp?ds=sidebyside

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 7e02dd7f62..cca538bbff 100644
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -56,14 +56,14 @@ wxBEGIN_FLAGS( wxSliderStyle )
     wxFLAGS_MEMBER(wxDOUBLE_BORDER)
     wxFLAGS_MEMBER(wxRAISED_BORDER)
     wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
 
     // standard window styles
     wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
     wxFLAGS_MEMBER(wxCLIP_CHILDREN)
     wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
     wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
     wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
     wxFLAGS_MEMBER(wxVSCROLL)
     wxFLAGS_MEMBER(wxHSCROLL)
@@ -394,11 +394,6 @@ void wxSlider95::SetValue(int value)
 }
 
 void wxSlider95::DoGetSize(int *width, int *height) const
-{
-    GetSize(width, height);
-}
-
-void wxSlider95::GetSize(int *width, int *height) const
 {
     RECT rect;
     rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
@@ -414,8 +409,10 @@ void wxSlider95::GetSize(int *width, int *height) const
     if (m_staticValue)
         wxFindMaxSize(m_staticValue, &rect);
 
-    *width = rect.right - rect.left;
-    *height = rect.bottom - rect.top;
+    if ( width )
+        *width = rect.right - rect.left;
+    if ( height )
+        *height = rect.bottom - rect.top;
 }
 
 void wxSlider95::GetPosition(int *x, int *y) const
@@ -518,7 +515,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 (int) min_len, cy, TRUE);
             x_offset += (int)(min_len + cx);
 
-            int slider_length = (int)(w1 - x_offset - max_len - cx);
+            // slider_length = (total width available) - (width used so far)
+            //                   - (width of max label) - (border)
+            int slider_length = (int)(w1 - (x_offset-x) - max_len - cx);
 
             int slider_height = h1;
             if (slider_height < 0 )
@@ -573,13 +572,6 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             {
                 int new_width = (int)(wxMax(min_len, max_len));
                 int valueHeight = (int)cyf;
-/*** Suggested change by George Tasker - remove this block...
-#ifdef __WIN32__
-      // For some reason, under Win95, the text edit control has
-      // a lot of space before the first character
-      new_width += 3*cx;
-#endif
- ... and replace with following line: */
                 new_width += cx;
 
                 // The height needs to be a bit bigger under Win95 if
@@ -595,7 +587,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 (int) min_len, cy, TRUE);
             y_offset += cy;
 
-            int slider_length = (int)(h1 - y_offset - cy - cy);
+            //  slider_length = (total height available) - (height used so far) 
+            //                              - (height of max label) - (border)
+            int slider_length = (int)(h1 - (y_offset-y) - cy - cy);
 
             int slider_width = w1;
             if (slider_width < 0 )