no message

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 883951314d80c3a7c2f5d7647229a3898fd97a4a..5347975b7159ebab176528a6db78ae1c647af6b7 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -68,8 +68,8 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
   SetValidator(validator);
 
   if (parent) parent->AddChild(this);
   SetValidator(validator);
 
   if (parent) parent->AddChild(this);

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;

 
   m_staticValue = 0;
   m_staticMin = 0;
 
   m_staticValue = 0;
   m_staticMin = 0;


@@ -154,6 +154,10 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
   SubclassWin(GetHWND());
 
 
   SubclassWin(GetHWND());
 

+  SetWindowText((HWND) m_hWnd, "");
+
+  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


@@ -163,7 +167,6 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
                              0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                              wxGetInstance(), NULL);
 
                              0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                              wxGetInstance(), NULL);
 

-      SetFont(parent->GetFont());

 
       if (GetFont())
       {
 
       if (GetFont())
       {


@@ -418,6 +421,11 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
        else
        {
                // No labels
        else
        {
                // No labels

+               // If we're prepared to use the existing size, then...
+               if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+               {
+                       GetSize(&w1, &h1);
+               }

                if ( w1 < 0 )
                        w1 = 200;
                if ( h1 < 0 )
                if ( w1 < 0 )
                        w1 = 200;
                if ( h1 < 0 )


@@ -479,6 +487,11 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
        else
        {
                // No labels
        else
        {
                // No labels

+               // If we're prepared to use the existing size, then...
+               if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+               {
+                       GetSize(&w1, &h1);
+               }

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