Avoid core dumps when SetImageList is used.

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 3182e6ccb8b7943e6b42035f2dd9af4028040794..50b340c87b668c181e0f019bdc6724e5ccbf729d 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -241,8 +241,6 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     ::SetWindowText((HWND) m_hWnd, wxEmptyString);
 
 
     ::SetWindowText((HWND) m_hWnd, wxEmptyString);
 

-    SetFont(parent->GetFont());
-

     if ( m_windowStyle & wxSL_LABELS )
     {
         // Finally, create max value static item
     if ( m_windowStyle & wxSL_LABELS )
     {
         // Finally, create max value static item


@@ -394,11 +392,6 @@ void wxSlider95::SetValue(int value)
 }
 
 void wxSlider95::DoGetSize(int *width, int *height) const
 }
 
 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;
 {
     RECT rect;
     rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;


@@ -414,8 +407,10 @@ void wxSlider95::GetSize(int *width, int *height) const
     if (m_staticValue)
         wxFindMaxSize(m_staticValue, &rect);
 
     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
 }
 
 void wxSlider95::GetPosition(int *x, int *y) const


@@ -518,7 +513,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) 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 )
 
             int slider_height = h1;
             if (slider_height < 0 )


@@ -573,13 +570,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;
             {
                 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
                 new_width += cx;
 
                 // The height needs to be a bit bigger under Win95 if


@@ -595,7 +585,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 (int) min_len, cy, TRUE);
             y_offset += cy;
 
                 (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 )
 
             int slider_width = w1;
             if (slider_width < 0 )