Various small fixes

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 883951314d80c3a7c2f5d7647229a3898fd97a4a..6981d0a1b09df8eabd119e0cb35ba23e487d5b83 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -22,6 +22,8 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
+#include <wx/utils.h>
+#include <wx/brush.h>
 #endif
 
 #ifdef __WIN95__
@@ -29,19 +31,12 @@
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
 #include <commctrl.h>
 #endif
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSlider95, wxControl)
-  EVT_SCROLL(wxSlider95::OnScroll)
-END_EVENT_TABLE()
-#endif
-
 #endif
 
 // Slider
@@ -68,8 +63,8 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
   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;
@@ -154,6 +149,10 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
   SubclassWin(GetHWND());
 
+  SetWindowText((HWND) m_hWnd, "");
+
+  SetFont(parent->GetFont());
+
   if ( m_windowStyle & wxSL_LABELS )
   {
       // Finally, create max value static item
@@ -163,22 +162,20 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
                              0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                              wxGetInstance(), NULL);
 
-      SetFont(parent->GetFont());
 
-      if (GetFont())
+      if (GetFont().Ok())
       {
-//        GetFont()->RealizeResource();
-        if (GetFont()->GetResourceHandle())
+        if (GetFont().GetResourceHandle())
         {
                    if ( m_staticMin )
                    SendMessage((HWND)m_staticMin,WM_SETFONT,
-                           (WPARAM)GetFont()->GetResourceHandle(),0L);
+                           (WPARAM)GetFont().GetResourceHandle(),0L);
                    if ( m_staticMax )
                    SendMessage((HWND)m_staticMax,WM_SETFONT,
-                      (WPARAM)GetFont()->GetResourceHandle(),0L);
+                      (WPARAM)GetFont().GetResourceHandle(),0L);
            if (m_staticValue)
                    SendMessage((HWND)m_staticValue,WM_SETFONT,
-                        (WPARAM)GetFont()->GetResourceHandle(),0L);
+                        (WPARAM)GetFont().GetResourceHandle(),0L);
         }
       }
   }
@@ -253,6 +250,11 @@ void wxSlider95::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
         event.SetPosition(newPos);
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);
+
+        wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+        cevent.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( cevent );
+
       }
     }
 }
@@ -366,7 +368,7 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cy;
   int cyf;
 
-  wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
 
   if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
   {
@@ -375,12 +377,12 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
     int min_len = 0;
 
     GetWindowText((HWND) m_staticMin, buf, 300);
-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
 
     int max_len = 0;
 
     GetWindowText((HWND) m_staticMax, buf, 300);
-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
     if (m_staticValue)
     {
       int new_width = (int)(wxMax(min_len, max_len));
@@ -418,6 +420,11 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
        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 )
@@ -431,11 +438,11 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
        {
     int min_len;
     GetWindowText((HWND) m_staticMin, buf, 300);
-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL,GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
 
     int max_len;
     GetWindowText((HWND) m_staticMax, buf, 300);
-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
 
     if (m_staticValue)
     {
@@ -479,6 +486,11 @@ void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
        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 )
@@ -602,21 +614,6 @@ bool wxSlider95::ContainsHWND(WXHWND hWnd) const
        return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
 }
 
-#if WXWIN_COMPATIBILITY
-// Backward compatibility
-void wxSlider95::OnScroll(wxScrollEvent& event)
-{
-    wxEventType oldEvent = event.GetEventType();
-    event.SetEventType( wxEVT_COMMAND_SLIDER_UPDATED );
-    if ( !GetEventHandler()->ProcessEvent(event) )
-    {
-        event.SetEventType( oldEvent );
-        if (!GetParent()->GetEventHandler()->ProcessEvent(event))
-            event.Skip();
-    }
-}
-#endif
-
 void wxSlider95::Command (wxCommandEvent & event)
 {
   SetValue (event.GetInt());