* Added threads event propagation. Should compile on GTK (tested).

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 63d743e66c518824fd9661d7642fa94b89a0158a..26d7488832c21118c44ca019855fe11920eec1ea 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -24,22 +24,17 @@
 #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)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSliderMSW, wxControl)
-  EVT_SCROLL(wxSliderMSW::OnScroll)
-END_EVENT_TABLE()
-#endif
-
 #endif
 
 // Slider
-wxSliderMSW::wxSliderMSW(void)
+wxSliderMSW::wxSliderMSW()
 {
   m_staticValue = 0;
   m_staticMin = 0;
@@ -62,8 +57,8 @@ bool wxSliderMSW::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;
@@ -136,22 +131,22 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 
-  SetFont(* parent->GetFont());
+  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);
     }
   }
 
@@ -227,6 +222,10 @@ void wxSliderMSW::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 );
       }
     }
 }
@@ -236,7 +235,7 @@ void wxSliderMSW::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
        MSWOnVScroll(wParam, pos, control);
 }
 
-wxSliderMSW::~wxSliderMSW(void)
+wxSliderMSW::~wxSliderMSW()
 {
     if (m_staticMin)
       DestroyWindow((HWND) m_staticMin);
@@ -246,7 +245,7 @@ wxSliderMSW::~wxSliderMSW(void)
       DestroyWindow((HWND) m_staticValue);
 }
 
-int wxSliderMSW::GetValue(void) const
+int wxSliderMSW::GetValue() const
 {
   return ::GetScrollPos((HWND) GetHWND(), SB_CTL);
 }
@@ -302,11 +301,20 @@ void wxSliderMSW::GetPosition(int *x, int *y) const
   if (parent)
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
 
+  // We may be faking the client origin.
+  // So a window that's really at (0, 30) may appear
+  // (to wxWin apps) to be at (0, 0).
+  if (GetParent())
+  {
+    wxPoint pt(GetParent()->GetClientAreaOrigin());
+    point.x -= pt.x;
+    point.y -= pt.y;
+  }
   *x = point.x;
   *y = point.y;
 }
 
-void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int x1 = x;
   int y1 = y;
@@ -320,6 +328,8 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
   char buf[300];
 
   int x_offset = x;
@@ -329,7 +339,7 @@ void wxSliderMSW::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)
   {
@@ -338,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);
-    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));
@@ -389,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);
-    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)
     {
@@ -491,16 +501,16 @@ void wxSliderMSW::SetPageSize(int pageSize)
   m_pageSize = pageSize;
 }
 
-int wxSliderMSW::GetPageSize(void) const
+int wxSliderMSW::GetPageSize() const
 {
   return m_pageSize;
 }
 
-void wxSliderMSW::ClearSel(void)
+void wxSliderMSW::ClearSel()
 {
 }
 
-void wxSliderMSW::ClearTicks(void)
+void wxSliderMSW::ClearTicks()
 {
 }
 
@@ -509,17 +519,17 @@ void wxSliderMSW::SetLineSize(int lineSize)
   m_lineSize = lineSize;
 }
 
-int wxSliderMSW::GetLineSize(void) const
+int wxSliderMSW::GetLineSize() const
 {
   return m_lineSize;
 }
 
-int wxSliderMSW::GetSelEnd(void) const
+int wxSliderMSW::GetSelEnd() const
 {
   return 0;
 }
 
-int wxSliderMSW::GetSelStart(void) const
+int wxSliderMSW::GetSelStart() const
 {
   return 0;
 }
@@ -532,7 +542,7 @@ void wxSliderMSW::SetThumbLength(int len)
 {
 }
 
-int wxSliderMSW::GetThumbLength(void) const
+int wxSliderMSW::GetThumbLength() const
 {
   return 0;
 }
@@ -546,21 +556,6 @@ bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const
        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());