Blind fixes for Mac project files (version number, missing cpp files)

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index ba25fe168717c5a9d604919944738eceb0cbaa24..4187123630beb5b457efb5adef6683f749bc04a3 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slider95.h"
 #endif
 
 #pragma implementation "slider95.h"
 #endif
 


@@ -33,11 +33,76 @@
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #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 , EMPTY_MACROVALUE , 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()
 
 // Slider
 wxSlider95::wxSlider95()


@@ -59,18 +124,16 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    // default is no border

     if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
         style |= wxBORDER_NONE;
 
     if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
         style |= wxBORDER_NONE;
 

-    SetName(name);
-#if wxUSE_VALIDATORS
-    SetValidator(validator);
-#endif // wxUSE_VALIDATORS
+    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
+        return false;

 
     if (parent) parent->AddChild(this);
 
 
     if (parent) parent->AddChild(this);
 

-    SetBackgroundColour(parent->GetBackgroundColour()) ;
-    SetForegroundColour(parent->GetForegroundColour()) ;
+    InheritAttributes();

 
     m_staticValue = (WXHWND) NULL;;
     m_staticMin = (WXHWND) NULL;;
 
     m_staticValue = (WXHWND) NULL;;
     m_staticMin = (WXHWND) NULL;;


@@ -80,25 +143,16 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
     m_windowStyle = style;
     m_tickFreq = 0;
 
     m_windowStyle = style;
     m_tickFreq = 0;
 

-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-

     long msStyle = 0;
     long msStyle = 0;

-    long wstyle = 0;

 
     if ( m_windowStyle & wxSL_LABELS )
     {
 
     if ( m_windowStyle & wxSL_LABELS )
     {

-        msStyle |= SS_CENTER;
+        msStyle |= SS_CENTER|WS_VISIBLE;

 
         WXDWORD exStyle = 0;
 
         WXDWORD exStyle = 0;

-        msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
+        long valueStyle = m_windowStyle & ~wxBORDER_MASK;
+        valueStyle |= wxBORDER_SUNKEN;
+        msStyle |= MSWGetStyle(valueStyle, & exStyle) ;

 
         m_staticValue = (WXHWND) CreateWindowEx
             (
 
         m_staticValue = (WXHWND) CreateWindowEx
             (


@@ -111,9 +165,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
         // Now create min static control
         wxString minLabel;
         minLabel.Printf(wxT("%d"), minValue);
         // Now create min static control
         wxString minLabel;
         minLabel.Printf(wxT("%d"), minValue);

-        wstyle = STATIC_FLAGS;
+        long wstyle = STATIC_FLAGS;

         if ( m_windowStyle & wxCLIP_SIBLINGS )
         if ( m_windowStyle & wxCLIP_SIBLINGS )

-            msStyle |= WS_CLIPSIBLINGS;
+            wstyle |= WS_CLIPSIBLINGS;

         m_staticMin = (WXHWND) CreateWindowEx
             (
                 0, wxT("STATIC"), minLabel,
         m_staticMin = (WXHWND) CreateWindowEx
             (
                 0, wxT("STATIC"), minLabel,


@@ -125,7 +179,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     WXDWORD exStyle = 0;
 
 
     WXDWORD exStyle = 0;
 

-    msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;    
+    msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
+
+    wxUnusedVar(msStyle);

 
     if (m_windowStyle & wxSL_VERTICAL)
         msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
     if (m_windowStyle & wxSL_VERTICAL)
         msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;


@@ -153,7 +209,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     HWND scroll_bar = CreateWindowEx
         (
 
     HWND scroll_bar = CreateWindowEx
         (

-            exStyle, TRACKBAR_CLASS, wxT(""),
+            exStyle, TRACKBAR_CLASS, wxEmptyString,

             msStyle,
             0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL
             msStyle,
             0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL


@@ -172,19 +228,17 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     SubclassWin(GetHWND());
 
 
     SubclassWin(GetHWND());
 

-    ::SetWindowText((HWND) m_hWnd, wxT(""));
-
-    SetFont(parent->GetFont());
+    ::SetWindowText((HWND) m_hWnd, wxEmptyString);

 
     if ( m_windowStyle & wxSL_LABELS )
     {
         // Finally, create max value static item
         wxString maxLabel;
         maxLabel.Printf(wxT("%d"), maxValue);
 
     if ( m_windowStyle & wxSL_LABELS )
     {
         // Finally, create max value static item
         wxString maxLabel;
         maxLabel.Printf(wxT("%d"), maxValue);

-        wstyle = STATIC_FLAGS;
+        long wstyle = STATIC_FLAGS;

 
         if ( m_windowStyle & wxCLIP_SIBLINGS )
 
         if ( m_windowStyle & wxCLIP_SIBLINGS )

-            msStyle |= WS_CLIPSIBLINGS;
+            wstyle |= WS_CLIPSIBLINGS;

 
         m_staticMax = (WXHWND) CreateWindowEx
             (
 
         m_staticMax = (WXHWND) CreateWindowEx
             (


@@ -214,10 +268,14 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
         }
     }
 
         }
     }
 

-    SetSize(x, y, width, height);
+    SetSize(pos.x, pos.y, size.x, size.y);

     SetValue(value);
 
     SetValue(value);
 

-    return TRUE;
+    // SetInitialBestSize is not called since we don't call MSWCreateControl
+    // for this control, so call SetBestSize here instead.
+    SetBestSize(size);
+
+    return true;

 }
 
 bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 }
 
 bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,


@@ -264,14 +322,14 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 
         default:
             // unknown scroll event?
 
         default:
             // unknown scroll event?

-            return FALSE;
+            return false;

     }
 
     int newPos = (int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it
     }
 
     int newPos = (int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it

-        return TRUE;
+        return true;

     }
 
     SetValue(newPos);
     }
 
     SetValue(newPos);


@@ -327,11 +385,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;


@@ -347,8 +400,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


@@ -399,9 +454,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
 
     int currentX, currentY;
     GetPosition(&currentX, &currentY);

-    if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

        x1 = currentX;
        x1 = currentX;

-    if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         y1 = currentY;
 
     AdjustForParentClientOrigin(x1, y1, sizeFlags);
         y1 = currentY;
 
     AdjustForParentClientOrigin(x1, y1, sizeFlags);


@@ -415,7 +470,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int cy;
     int cyf;
 
     int cy;
     int cyf;
 

-    wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());

 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
     {
 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
     {


@@ -424,12 +479,12 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             int min_len = 0;
 
             ::GetWindowText((HWND) m_staticMin, buf, 300);
             int min_len = 0;
 
             ::GetWindowText((HWND) m_staticMin, buf, 300);

-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);

 
             int max_len = 0;
 
             ::GetWindowText((HWND) m_staticMax, buf, 300);
 
             int max_len = 0;
 
             ::GetWindowText((HWND) m_staticMax, buf, 300);

-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);

             if (m_staticValue)
             {
                 int new_width = (int)(wxMax(min_len, max_len));
             if (m_staticValue)
             {
                 int new_width = (int)(wxMax(min_len, max_len));


@@ -447,11 +502,13 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 x_offset += new_width + cx;
             }
 
                 x_offset += new_width + cx;
             }
 

-            MoveWindow((HWND) m_staticMin, x_offset, y_offset,
+            ::MoveWindow((HWND) m_staticMin, x_offset, y_offset,

                 (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 )


@@ -465,7 +522,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 slider_length, slider_height, TRUE);
             x_offset += slider_length + cx;
 
                 slider_length, slider_height, TRUE);
             x_offset += slider_length + cx;
 

-            MoveWindow((HWND) m_staticMax, x_offset, y_offset,
+            ::MoveWindow((HWND) m_staticMax, x_offset, y_offset,

                 (int) max_len, cy, TRUE);
         }
         else
                 (int) max_len, cy, TRUE);
         }
         else


@@ -474,8 +531,8 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             // If we're prepared to use the existing size, then...
             if
             (
             // If we're prepared to use the existing size, then...
             if
             (

-                width == -1
-                && height == -1
+                width == wxDefaultCoord
+                && height == wxDefaultCoord

                 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
             )
             {
                 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
             )
             {


@@ -483,7 +540,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             }
 
             if ( w1 < 0 )
             }
 
             if ( w1 < 0 )

-                w1 = 200;
+                w1 = 100;

             if ( h1 < 0 )
                 h1 = 20;
 
             if ( h1 < 0 )
                 h1 = 20;
 


@@ -496,23 +553,16 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         {
             int min_len;
             ::GetWindowText((HWND) m_staticMin, buf, 300);
         {
             int min_len;
             ::GetWindowText((HWND) m_staticMin, buf, 300);

-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);

 
             int max_len;
             ::GetWindowText((HWND) m_staticMax, buf, 300);
 
             int max_len;
             ::GetWindowText((HWND) m_staticMax, buf, 300);

-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);

 
             if (m_staticValue)
             {
                 int new_width = (int)(wxMax(min_len, max_len));
                 int valueHeight = (int)cyf;
 
             if (m_staticValue)
             {
                 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


@@ -528,7 +578,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 )


@@ -551,7 +603,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             // If we're prepared to use the existing size, then...
             if
             (
             // If we're prepared to use the existing size, then...
             if
             (

-                width == -1 && height == -1
+                width == wxDefaultCoord && height == wxDefaultCoord

                 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
             )
             {
                 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
             )
             {


@@ -561,13 +613,94 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             if ( w1 < 0 )
                 w1 = 20;
             if ( h1 < 0 )
             if ( w1 < 0 )
                 w1 = 20;
             if ( h1 < 0 )

-                h1 = 200;
+                h1 = 100;

 
             ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
         }
     }
 }
 
 
             ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
         }
     }
 }
 

+
+// A reimplementaion of the mess above changed a bit to just determine the min
+// size needed.  It would certainly be nice to refactor this and DoSetSize
+// somehow.
+wxSize wxSlider95::DoGetBestSize() const
+{
+    wxSize rv;
+    wxChar buf[300];
+    int cx;
+    int cy;
+    int cyf;
+    int min_len = 0;
+    int max_len = 0;
+
+    wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());
+
+    if ( !HasFlag(wxSL_VERTICAL))
+    {
+        rv = wxSize(100, 20);  // default size for the slider itself
+
+        if (HasFlag(wxSL_LABELS))  // do we need to add more for the labels?
+        {
+            ::GetWindowText((HWND) m_staticMin, buf, 300);
+            GetTextExtent(buf, &min_len, &cyf);
+            rv.x += min_len + cx;
+
+            ::GetWindowText((HWND) m_staticMax, buf, 300);
+            GetTextExtent(buf, &max_len, &cyf);
+            rv.x += max_len + cx;
+
+            if (m_staticValue)
+            {
+                int new_width = (int)(wxMax(min_len, max_len));
+                int valueHeight = (int)cyf;
+
+#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
+                // The height needs to be a bit bigger under Win95 if
+                // using native 3D effects.
+                valueHeight = (int) (valueHeight * 1.5) ;
+
+                rv.x += new_width + cx;
+                rv.y = wxMax(valueHeight, rv.y);
+            }
+        }
+    }
+    else // ! wxSL_HORIZONTAL
+    {
+        rv = wxSize(20, 100);  // default size for the slider itself
+
+        if (HasFlag(wxSL_LABELS)) // do we need to add more for the labels?
+        {
+            ::GetWindowText((HWND) m_staticMin, buf, 300);
+            GetTextExtent(buf, &min_len, &cyf);
+            rv.y += cy;
+
+            ::GetWindowText((HWND) m_staticMax, buf, 300);
+            GetTextExtent(buf, &max_len, &cyf);
+            rv.y += cy;
+
+            if (m_staticValue)
+            {
+                int new_width = (int)(wxMax(min_len, max_len));
+                int valueHeight = (int)cyf;
+                new_width += cx;
+
+                // The height needs to be a bit bigger under Win95 if
+                // using native 3D effects.
+                valueHeight = (int) (valueHeight * 1.5) ;
+                rv.y += valueHeight;
+                rv.x = wxMax(new_width, rv.x);
+            }
+        }
+    }
+    return rv;
+}
+
+

 void wxSlider95::SetRange(int minValue, int maxValue)
 {
     m_rangeMin = minValue;
 void wxSlider95::SetRange(int minValue, int maxValue)
 {
     m_rangeMin = minValue;


@@ -592,9 +725,13 @@ void wxSlider95::SetRange(int minValue, int maxValue)
 WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

+#ifndef __WXWINCE__

     if ( nCtlColor == CTLCOLOR_SCROLLBAR )
         return 0;
     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);
 }
     // Otherwise, it's a static
     return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
 }


@@ -693,22 +830,18 @@ bool wxSlider95::Show(bool show)
 {
     wxWindow::Show(show);
 
 {
     wxWindow::Show(show);
 

-    int cshow;
-    if (show)
-        cshow = SW_SHOW;
-    else
-        cshow = SW_HIDE;
+    int cshow = show ? SW_SHOW : SW_HIDE;

 
     if(m_staticValue)
 
     if(m_staticValue)

-        ShowWindow((HWND) m_staticValue, (BOOL)cshow);
+        ShowWindow((HWND) m_staticValue, cshow);

 
     if(m_staticMin)
 
     if(m_staticMin)

-        ShowWindow((HWND) m_staticMin, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMin, cshow);

 
     if(m_staticMax)
 
     if(m_staticMax)

-        ShowWindow((HWND) m_staticMax, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMax, cshow);

 
 

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif