wxListCtrl column resize bug corrected

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index cd2b47760c11e35ac5c3c2439e78d4f6f64414cd..83d4a1484683f477a528b2c46ee0eb170c558a64 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -24,18 +24,13 @@
 #include <stdio.h>
 #endif
 
 #include <stdio.h>
 #endif
 

+#include "wx/utils.h"
+#include "wx/brush.h"

 #include "wx/msw/slidrmsw.h"
 #include "wx/msw/private.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
 #include "wx/msw/slidrmsw.h"
 #include "wx/msw/private.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)

-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSliderMSW, wxControl)
-  EVT_SCROLL(wxSliderMSW::OnScroll)
-END_EVENT_TABLE()
-#endif
-

 #endif
 
 // Slider
 #endif
 
 // Slider


@@ -136,22 +131,22 @@ bool wxSliderMSW::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());
+  SetFont(parent->GetFont());

 
 

-  if (GetFont())
+  if (GetFont().Ok())

   {
 //    GetFont()->RealizeResource();
   {
 //    GetFont()->RealizeResource();

-    if (GetFont()->GetResourceHandle())
+    if (GetFont().GetResourceHandle())

     {
                if ( m_staticMin )
                SendMessage((HWND)m_staticMin,WM_SETFONT,
     {
                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,
                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,
        if (m_staticValue)
                SendMessage((HWND)m_staticValue,WM_SETFONT,

-                    (WPARAM)GetFont()->GetResourceHandle(),0L);
+                    (WPARAM)GetFont().GetResourceHandle(),0L);

     }
   }
 
     }
   }
 


@@ -227,6 +222,10 @@ void wxSliderMSW::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
         event.SetPosition(newPos);
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);
         event.SetPosition(newPos);
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);

+
+        wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+        cevent.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( cevent );

       }
     }
 }
       }
     }
 }


@@ -340,7 +339,7 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cy;
   int cyf;
 
   int cy;
   int cyf;
 

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

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


@@ -349,12 +348,12 @@ void wxSliderMSW::SetSize(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, GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());

 
     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, GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());

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


@@ -400,11 +399,11 @@ void wxSliderMSW::SetSize(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,GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL,& this->GetFont());

 
     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, GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());

 
     if (m_staticValue)
     {
 
     if (m_staticValue)
     {


@@ -557,21 +556,6 @@ bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const
        return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
 }
 
        return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
 }
 

-#if WXWIN_COMPATIBILITY
-// Backward compatibility
-void wxSliderMSW::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 wxSliderMSW::Command (wxCommandEvent & event)
 {
   SetValue (event.GetInt());
 void wxSliderMSW::Command (wxCommandEvent & event)
 {
   SetValue (event.GetInt());