added DoSetNativeFontInfo() to avoid virtual function hiding

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index aa01a17495a7165ab9e12d1c63f44d685961789f..af096e87f3b6816ecd0da036300c14dd03c39408 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:       wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -24,22 +24,15 @@
 #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"
 
 #include "wx/msw/slidrmsw.h"
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
 

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

 // Slider
 // Slider

-wxSliderMSW::wxSliderMSW(void)
+wxSliderMSW::wxSliderMSW()

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


@@ -48,22 +41,23 @@ wxSliderMSW::wxSliderMSW(void)
   m_lineSize = 1;
   m_rangeMax = 0;
   m_rangeMin = 0;
   m_lineSize = 1;
   m_rangeMax = 0;
   m_rangeMin = 0;

-  m_tickFreq = 0;

 }
 
 }
 

-bool wxSliderMSW::Create(wxWindow *parent, const wxWindowID id,
-           const int value, const int minValue, const int maxValue,
+bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
+           int value, int minValue, int maxValue,

            const wxPoint& pos,
            const wxPoint& pos,

-           const wxSize& size, const long style,
+           const wxSize& size, long style,

            const wxValidator& validator,
            const wxString& name)
 {
   SetName(name);
            const wxValidator& validator,
            const wxString& name)
 {
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
   if (parent) parent->AddChild(this);
 
   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;


@@ -71,12 +65,11 @@ bool wxSliderMSW::Create(wxWindow *parent, const wxWindowID id,
   m_pageSize = 1;
   m_lineSize = 1;
   m_windowStyle = style;
   m_pageSize = 1;
   m_lineSize = 1;
   m_windowStyle = style;

-  m_tickFreq = 0;

 
   if ( id == -1 )
 
   if ( id == -1 )

-       m_windowId = (int)NewControlId();
+      m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+    m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
 
   int x = pos.x;
   int y = pos.y;


@@ -87,31 +80,35 @@ bool wxSliderMSW::Create(wxWindow *parent, const wxWindowID id,
   
   long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
 
   
   long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
 

+   if ( m_windowStyle & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+

   bool want3D;
   WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 

-  m_staticValue = (WXHWND) CreateWindowEx(exStyle, "STATIC", NULL,
+  m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,

                            msStyle,
                            0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                            wxGetInstance(), NULL);
 
   // Now create min static control
                            msStyle,
                            0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                            wxGetInstance(), NULL);
 
   // Now create min static control

-  sprintf(wxBuffer, "%d", minValue);
-  m_staticMin = (WXHWND) CreateWindowEx(0, "STATIC", wxBuffer,
-                         STATIC_FLAGS,
+  wxString buf;
+  buf.Printf(wxT("%d"), minValue);
+  DWORD wstyle = STATIC_FLAGS;
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+  m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf,
+                         wstyle,

                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
 

-  // Now create slider
-  m_windowId = (int)NewControlId();
-

   msStyle = 0;
   if (m_windowStyle & wxSL_VERTICAL)
     msStyle = SBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
   msStyle = 0;
   if (m_windowStyle & wxSL_VERTICAL)
     msStyle = SBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 

-  HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), "SCROLLBAR", wxBuffer,
+  HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxT(""),

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


@@ -130,28 +127,31 @@ bool wxSliderMSW::Create(wxWindow *parent, const wxWindowID id,
   SubclassWin(GetHWND());
 
   // Finally, create max value static item
   SubclassWin(GetHWND());
 
   // Finally, create max value static item

-  sprintf(wxBuffer, "%d", maxValue);
-  m_staticMax = (WXHWND) CreateWindowEx(0, "STATIC", wxBuffer,
-                         STATIC_FLAGS,
+  buf.Printf(wxT("%d"), maxValue);
+  wstyle = STATIC_FLAGS;
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+  m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf,
+                         wstyle,

                          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,
-                       (WPARAM)GetFont()->GetResourceHandle(),0L);
-               if ( m_staticMax )
-               SendMessage((HWND)m_staticMax,WM_SETFONT,
-                  (WPARAM)GetFont()->GetResourceHandle(),0L);
-       if (m_staticValue)
-               SendMessage((HWND)m_staticValue,WM_SETFONT,
-                    (WPARAM)GetFont()->GetResourceHandle(),0L);
+        if ( m_staticMin )
+              SendMessage((HWND)m_staticMin,WM_SETFONT,
+                      (WPARAM)GetFont().GetResourceHandle(),0L);
+        if ( m_staticMax )
+              SendMessage((HWND)m_staticMax,WM_SETFONT,
+                  (WPARAM)GetFont().GetResourceHandle(),0L);
+          if (m_staticValue)
+            SendMessage((HWND)m_staticValue,WM_SETFONT,
+                    (WPARAM)GetFont().GetResourceHandle(),0L);

     }
   }
 
     }
   }
 


@@ -161,7 +161,8 @@ bool wxSliderMSW::Create(wxWindow *parent, const wxWindowID id,
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxSliderMSW::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
+                              WXWORD pos, WXHWND control)

 {
     int position = ::GetScrollPos((HWND)control, SB_CTL);
 
 {
     int position = ::GetScrollPos((HWND)control, SB_CTL);
 


@@ -169,74 +170,79 @@ void wxSliderMSW::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHW
     wxEventType scrollEvent = wxEVT_NULL;
     switch ( wParam )
     {
     wxEventType scrollEvent = wxEVT_NULL;
     switch ( wParam )
     {

-            case SB_TOP:
-                    nScrollInc = m_rangeMax - position;
-                    scrollEvent = wxEVT_SCROLL_TOP;
-                    break;
-
-            case SB_BOTTOM:
-                    nScrollInc = - position;
-                    scrollEvent = wxEVT_SCROLL_BOTTOM;
-                    break;
-
-            case SB_LINEUP:
-                    nScrollInc = - GetLineSize();
-                    scrollEvent = wxEVT_SCROLL_LINEUP;
-                    break;
-
-            case SB_LINEDOWN:
-                    nScrollInc = GetLineSize();
-                    scrollEvent = wxEVT_SCROLL_LINEDOWN;
-                    break;
-
-            case SB_PAGEUP:
-                    nScrollInc = -GetPageSize();
-                    scrollEvent = wxEVT_SCROLL_PAGEUP;
-                    break;
-
-            case SB_PAGEDOWN:
-                    nScrollInc = GetPageSize();
-                    scrollEvent = wxEVT_SCROLL_PAGEDOWN;
-                    break;
-
-            case SB_THUMBTRACK:
-            case SB_THUMBPOSITION:
+        case SB_TOP:
+            nScrollInc = m_rangeMax - position;
+            scrollEvent = wxEVT_SCROLL_TOP;
+            break;
+
+        case SB_BOTTOM:
+            nScrollInc = - position;
+            scrollEvent = wxEVT_SCROLL_BOTTOM;
+            break;
+
+        case SB_LINEUP:
+            nScrollInc = - GetLineSize();
+            scrollEvent = wxEVT_SCROLL_LINEUP;
+            break;
+
+        case SB_LINEDOWN:
+            nScrollInc = GetLineSize();
+            scrollEvent = wxEVT_SCROLL_LINEDOWN;
+            break;
+
+        case SB_PAGEUP:
+            nScrollInc = -GetPageSize();
+            scrollEvent = wxEVT_SCROLL_PAGEUP;
+            break;
+
+        case SB_PAGEDOWN:
+            nScrollInc = GetPageSize();
+            scrollEvent = wxEVT_SCROLL_PAGEDOWN;
+            break;
+
+        case SB_THUMBTRACK:
+        case SB_THUMBPOSITION:

 #ifdef __WIN32__
 #ifdef __WIN32__

-                    nScrollInc = (signed short)pos - position;
+            nScrollInc = (signed short)pos - position;

 #else
 #else

-                    nScrollInc = pos - position;
+            nScrollInc = pos - position;

 #endif
 #endif

-                    scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-                    break;
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+            break;

 
 

-            default:
-                    nScrollInc = 0;
-                    return;
+        default:
+            nScrollInc = 0;

     }
 
     }
 

-    if (nScrollInc != 0)
+    if (nScrollInc == 0)

     {
     {

+        // no event...
+        return FALSE;
+    }

 
 

-      int newPos = position + nScrollInc;
-
-      if (!(newPos < GetMin() || newPos > GetMax()))
-      {
-        SetValue(newPos);
+    int newPos = position + nScrollInc;

 
 

-        wxScrollEvent event(scrollEvent, m_windowId);
-        event.SetPosition(newPos);
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
-      }
+    if ( (newPos < GetMin()) || (newPos > GetMax()) )
+    {
+        // out of range - but we did process it
+        return TRUE;

     }
     }

-}

 
 

-void wxSliderMSW::MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
-{
-       MSWOnVScroll(wParam, pos, control);
+    SetValue(newPos);
+
+    wxScrollEvent event(scrollEvent, m_windowId);
+    event.SetPosition(newPos);
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(event);
+
+    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+    cevent.SetInt( newPos );
+    cevent.SetEventObject( this );
+
+    return GetEventHandler()->ProcessEvent( cevent );

 }
 
 }
 

-wxSliderMSW::~wxSliderMSW(void)
+wxSliderMSW::~wxSliderMSW()

 {
     if (m_staticMin)
       DestroyWindow((HWND) m_staticMin);
 {
     if (m_staticMin)
       DestroyWindow((HWND) m_staticMin);


@@ -246,18 +252,19 @@ wxSliderMSW::~wxSliderMSW(void)
       DestroyWindow((HWND) m_staticValue);
 }
 
       DestroyWindow((HWND) m_staticValue);
 }
 

-int wxSliderMSW::GetValue(void) const
+int wxSliderMSW::GetValue() const

 {
 {

-  return ::GetScrollPos((HWND) GetHWND(), SB_CTL);
+  return ::GetScrollPos(GetHwnd(), SB_CTL);

 }
 
 }
 

-void wxSliderMSW::SetValue(const int value)
+void wxSliderMSW::SetValue(int value)

 {
 {

-  ::SetScrollPos((HWND) GetHWND(), SB_CTL, value, TRUE);
+  ::SetScrollPos(GetHwnd(), SB_CTL, value, TRUE);

   if (m_staticValue)
   {
   if (m_staticValue)
   {

-    sprintf(wxBuffer, "%d", value);
-    SetWindowText((HWND) m_staticValue, wxBuffer);
+    wxString buf;
+    buf.Printf(wxT("%d"), value);
+    SetWindowText((HWND) m_staticValue, buf);

   }
 }
 
   }
 }
 


@@ -302,11 +309,22 @@ void wxSliderMSW::GetPosition(int *x, int *y) const
   if (parent)
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
 
   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;
 }
 
   *x = point.x;
   *y = point.y;
 }
 

-void wxSliderMSW::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+// TODO one day, make sense of all this horros and replace it with a readable
+//      DoGetBestSize()
+void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int x1 = x;
   int y1 = y;
 {
   int x1 = x;
   int y1 = y;


@@ -315,39 +333,41 @@ void wxSliderMSW::SetSize(const int x, const int y, const int width, const int h
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);

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

     x1 = currentX;
     x1 = currentX;

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

     y1 = currentY;
 
     y1 = currentY;
 

-  char buf[300];
+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
+  wxChar buf[300];

 
   int x_offset = x;
   int y_offset = y;
 
   int cx;     // slider,min,max sizes
   int cy;
 
   int x_offset = x;
   int y_offset = y;
 
   int cx;     // slider,min,max sizes
   int cy;

-  float cyf;
+  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)
   {

-       if ( m_windowStyle & wxSL_LABELS )
-       {
-    float min_len = 0.0;
+    if ( m_windowStyle & wxSL_LABELS )
+    {
+    int min_len = 0;

 
     GetWindowText((HWND) m_staticMin, buf, 300);
 
     GetWindowText((HWND) m_staticMin, buf, 300);

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

 
 

-    float max_len = 0.0;
+    int max_len = 0;

 
     GetWindowText((HWND) m_staticMax, buf, 300);
 
     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));

-         int valueHeight = (int)cyf;
+      int valueHeight = (int)cyf;

 #ifdef __WIN32__
       // For some reason, under Win95, the text edit control has
       // a lot of space before the first character
 #ifdef __WIN32__
       // For some reason, under Win95, the text edit control has
       // a lot of space before the first character


@@ -368,37 +388,37 @@ void wxSliderMSW::SetSize(const int x, const int y, const int width, const int h
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow((HWND) GetHWND(), x_offset, y_offset, slider_length, slider_height, TRUE);
+    MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE);

     x_offset += slider_length + cx;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
     }
     x_offset += slider_length + cx;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
     }

-       else
-       {
-               // No labels
-               if ( w1 < 0 )
-                       w1 = 200;
-               if ( h1 < 0 )
-                       h1 = 20;
-       MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
-       }
+    else
+    {
+        // No labels
+        if ( w1 < 0 )
+            w1 = 200;
+        if ( h1 < 0 )
+            h1 = 20;
+        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+    }

   }
   else
   {
   }
   else
   {

-       if ( m_windowStyle & wxSL_LABELS )
-       {
-    float min_len;
+    if ( m_windowStyle & wxSL_LABELS )
+    {
+    int min_len;

     GetWindowText((HWND) m_staticMin, buf, 300);
     GetWindowText((HWND) m_staticMin, buf, 300);

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

 
 

-    float max_len;
+    int max_len;

     GetWindowText((HWND) m_staticMax, buf, 300);
     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));

-         int valueHeight = (int)cyf;
+      int valueHeight = (int)cyf;

 /*** Suggested change by George Tasker - remove this block...
 #ifdef __WIN32__
       // For some reason, under Win95, the text edit control has
 /*** Suggested change by George Tasker - remove this block...
 #ifdef __WIN32__
       // For some reason, under Win95, the text edit control has


@@ -424,152 +444,98 @@ void wxSliderMSW::SetSize(const int x, const int y, const int width, const int h
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow((HWND) GetHWND(), x_offset, y_offset, slider_width, slider_length, TRUE);
+    MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE);

     y_offset += slider_length;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
     }
     y_offset += slider_length;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
     }

-       else
-       {
-               // No labels
-               if ( w1 < 0 )
-                       w1 = 20;
-               if ( h1 < 0 )
-                       h1 = 200;
-       MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
-       }
+    else
+    {
+        // No labels
+        if ( w1 < 0 )
+            w1 = 20;
+        if ( h1 < 0 )
+            h1 = 200;
+        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+    }

   }
 }
 
   }
 }
 

-void wxSliderMSW::SetRange(const int minValue, const int maxValue)
+void wxSliderMSW::SetRange(int minValue, int maxValue)

 {
   m_rangeMin = minValue;
   m_rangeMax = maxValue;
 
 {
   m_rangeMin = minValue;
   m_rangeMax = maxValue;
 

-  ::SetScrollRange((HWND) GetHWND(), SB_CTL, m_rangeMin, m_rangeMax, TRUE);
-  char buf[40];
+  ::SetScrollRange(GetHwnd(), SB_CTL, m_rangeMin, m_rangeMax, TRUE);
+  wxChar buf[40];

   if ( m_staticMin )
   {
   if ( m_staticMin )
   {

-       sprintf(buf, "%d", m_rangeMin);
-       SetWindowText((HWND) m_staticMin, buf);
+      wxSprintf(buf, wxT("%d"), m_rangeMin);
+      SetWindowText((HWND) m_staticMin, buf);

   }
 
   if ( m_staticMax )
   {
   }
 
   if ( m_staticMax )
   {

-    sprintf(buf, "%d", m_rangeMax);
+    wxSprintf(buf, wxT("%d"), m_rangeMax);

     SetWindowText((HWND) m_staticMax, buf);
   }
 }
 
     SetWindowText((HWND) m_staticMax, buf);
   }
 }
 

-WXHBRUSH wxSliderMSW::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
   if ( nCtlColor == CTLCOLOR_SCROLLBAR )
 {
   if ( nCtlColor == CTLCOLOR_SCROLLBAR )

-       return 0;
+    return 0;

 
   // Otherwise, it's a static
 
   // Otherwise, it's a static

-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
-
-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
-
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
-
-// For trackbars only
-void wxSliderMSW::SetTickFreq(const int n, const int pos)
-{
+  return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);

 }
 
 }
 

-void wxSliderMSW::SetPageSize(const int pageSize)
+void wxSliderMSW::SetPageSize(int pageSize)

 {
   m_pageSize = pageSize;
 }
 
 {
   m_pageSize = pageSize;
 }
 

-int wxSliderMSW::GetPageSize(void) const
+int wxSliderMSW::GetPageSize() const

 {
   return m_pageSize;
 }
 
 {
   return m_pageSize;
 }
 

-void wxSliderMSW::ClearSel(void)
-{
-}
-
-void wxSliderMSW::ClearTicks(void)
-{
-}
-
-void wxSliderMSW::SetLineSize(const int lineSize)
+void wxSliderMSW::SetLineSize(int lineSize)

 {
   m_lineSize = lineSize;
 }
 
 {
   m_lineSize = lineSize;
 }
 

-int wxSliderMSW::GetLineSize(void) const
+int wxSliderMSW::GetLineSize() const

 {
   return m_lineSize;
 }
 
 {
   return m_lineSize;
 }
 

-int wxSliderMSW::GetSelEnd(void) const
-{
-  return 0;
-}
-
-int wxSliderMSW::GetSelStart(void) const
-{
-  return 0;
-}
-
-void wxSliderMSW::SetSelection(const int minPos, const int maxPos)
-{
-}
-
-void wxSliderMSW::SetThumbLength(const int len)
-{
-}
-
-int wxSliderMSW::GetThumbLength(void) const
+// Not yet implemented
+void wxSliderMSW::SetThumbLength(int WXUNUSED(lenPixels))

 {
 {

-  return 0;

 }
 
 }
 

-void wxSliderMSW::SetTick(const int tickPos)
+// Not yet implemented
+int wxSliderMSW::GetThumbLength() const

 {
 {

+    return 0;

 }
 
 bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const
 {
 }
 
 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());
   ProcessCommand (event);
 }
 
 void wxSliderMSW::Command (wxCommandEvent & event)
 {
   SetValue (event.GetInt());
   ProcessCommand (event);
 }
 

-bool wxSliderMSW::Show(const bool show)
+bool wxSliderMSW::Show(bool show)

 {
 {

-       wxWindow::Show(show);
+    wxWindow::Show(show);

 
     int cshow;
     if (show)
 
     int cshow;
     if (show)


@@ -578,11 +544,11 @@ bool wxSliderMSW::Show(const bool show)
         cshow = SW_HIDE;
 
     if(m_staticValue)
         cshow = SW_HIDE;
 
     if(m_staticValue)

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

     if(m_staticMin)
     if(m_staticMin)

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

     if(m_staticMax)
     if(m_staticMax)

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

     return TRUE;
 }
 
     return TRUE;
 }