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 3e07c77a938ed791e5bb56b2e3ba91baa76a4790..50b340c87b668c181e0f019bdc6724e5ccbf729d 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "slider95.h"
 #endif
 
@@ -37,7 +37,72 @@
     #include <commctrl.h>
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSliderStyle )
+
+wxBEGIN_FLAGS( wxSliderStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+    
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_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(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSL_VERTICAL)
+    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
+    wxFLAGS_MEMBER(wxSL_LABELS)
+    wxFLAGS_MEMBER(wxSL_LEFT)
+    wxFLAGS_MEMBER(wxSL_TOP)
+    wxFLAGS_MEMBER(wxSL_RIGHT)
+    wxFLAGS_MEMBER(wxSL_BOTTOM)
+    wxFLAGS_MEMBER(wxSL_BOTH)
+    wxFLAGS_MEMBER(wxSL_SELRANGE)
+
+wxEND_FLAGS( wxSliderStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider95, wxControl,"wx/scrolbar.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSlider95)
+    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
+    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
+
+    wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSlider95)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_8( wxSlider95 , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
+#endif
 
 // Slider
 wxSlider95::wxSlider95()
@@ -56,7 +121,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos,
            const wxSize& size, long style,
-           const wxValidator& validator,
+           const wxValidator& wxVALIDATOR_PARAM(validator),
            const wxString& name)
 {
     if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
@@ -176,8 +241,6 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     ::SetWindowText((HWND) m_hWnd, wxEmptyString);
 
-    SetFont(parent->GetFont());
-
     if ( m_windowStyle & wxSL_LABELS )
     {
         // Finally, create max value static item
@@ -329,11 +392,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;
@@ -349,8 +407,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
@@ -453,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 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 )
@@ -508,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;
-/*** 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
@@ -530,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 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 )
@@ -594,9 +651,13 @@ void wxSlider95::SetRange(int minValue, int maxValue)
 WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
+#ifndef __WXWINCE__
     if ( nCtlColor == CTLCOLOR_SCROLLBAR )
         return 0;
-
+#else
+    if ( nCtlColor != CTLCOLOR_STATIC )
+        return 0;
+#endif
     // Otherwise, it's a static
     return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
 }