Added licence/copyright information

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 7bfe7c1a797cd11cb673cad21aff98e11c72156e..f9106b7830f51312bb63e7d7d669969d038e81a2 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -1,255 +1,353 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        slider95.cpp
-// Purpose:     wxSlider95, using the Win95 trackbar control
+// Name:        msw/slider.cpp
+// Purpose:     wxSlider, using the Win95 (and later) trackbar control

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows license
+// Copyright:   (c) Julian Smart 1998
+//                  Vadim Zeitlin 2004
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+// ============================================================================
+// declarations
+// ============================================================================
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slider95.h"
 #endif
 
 #pragma implementation "slider95.h"
 #endif
 

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_SLIDER
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include <wx/utils.h>
-#include <wx/brush.h>
+    #include "wx/brush.h"

 #endif
 
 #endif
 

-#ifdef __WIN95__
-
-#include "wx/msw/slider95.h"
-#include "wx/msw/private.h"
+#include "wx/slider.h"
+#include "wx/msw/subwin.h"

 
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
-#include <commctrl.h>
+#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
+    #include <commctrl.h>

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
+#define USE_DEFERRED_SIZING 1
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// indices of labels in wxSlider::m_labels
+enum
+{
+    SliderLabel_Min,
+    SliderLabel_Max,
+    SliderLabel_Value,
+    SliderLabel_Last
+};
+
+// the gap between the slider and the labels, in pixels
+static const int HGAP = 5;
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSliderStyle )
+
+wxBEGIN_FLAGS( wxSliderStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSL_VERTICAL)
+    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
+    wxFLAGS_MEMBER(wxSL_LABELS)
+    wxFLAGS_MEMBER(wxSL_LEFT)
+    wxFLAGS_MEMBER(wxSL_TOP)
+    wxFLAGS_MEMBER(wxSL_RIGHT)
+    wxFLAGS_MEMBER(wxSL_BOTTOM)
+    wxFLAGS_MEMBER(wxSL_BOTH)
+    wxFLAGS_MEMBER(wxSL_SELRANGE)
+    wxFLAGS_MEMBER(wxSL_INVERSE)
+
+wxEND_FLAGS( wxSliderStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/scrolbar.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSlider)
+    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
+    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
+
+    wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSlider)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)

 #endif
 
 #endif
 

-// Slider
-wxSlider95::wxSlider95()
-{
-  m_staticValue = 0;
-  m_staticMin = 0;
-  m_staticMax = 0;
-  m_pageSize = 1;
-  m_lineSize = 1;
-  m_rangeMax = 0;
-  m_rangeMin = 0;
-  m_tickFreq = 0;
+// ============================================================================
+// wxSlider implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// construction
+// ----------------------------------------------------------------------------
+
+void wxSlider::Init()
+{
+    m_labels = NULL;
+
+    m_pageSize = 1;
+    m_lineSize = 1;
+    m_rangeMax = 0;
+    m_rangeMin = 0;
+    m_tickFreq = 0;

 }
 
 }
 

-bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
-           int value, int minValue, int maxValue,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
-{
-  SetName(name);
-  SetValidator(validator);
-
-  if (parent) parent->AddChild(this);
-  SetBackgroundColour(parent->GetBackgroundColour()) ;
-  SetForegroundColour(parent->GetForegroundColour()) ;
-
-  m_staticValue = 0;
-  m_staticMin = 0;
-  m_staticMax = 0;
-  m_pageSize = 1;
-  m_lineSize = 1;
-  m_windowStyle = style;
-  m_tickFreq = 0;
-
-  if ( id == -1 )
-      m_windowId = (int)NewControlId();
-  else
-    m_windowId = id;
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  long msStyle ;
-
-  if ( m_windowStyle & wxSL_LABELS )
-  {
-      msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
-
-      bool want3D;
-      WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
-
-      m_staticValue = (WXHWND) CreateWindowEx(exStyle, _T("STATIC"), NULL,
-                               msStyle,
-                               0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
-                               wxGetInstance(), NULL);
-
-      // Now create min static control
-      wxSprintf(wxBuffer, _T("%d"), minValue);
-      m_staticMin = (WXHWND) CreateWindowEx(0, _T("STATIC"), wxBuffer,
-                             STATIC_FLAGS,
-                             0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
-                             wxGetInstance(), NULL);
-  }
-
-  msStyle = 0;
-  if (m_windowStyle & wxSL_VERTICAL)
-    msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
-  else
-    msStyle = TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
-
-  if ( m_windowStyle & wxSL_AUTOTICKS )
-    msStyle |= TBS_AUTOTICKS ;
-
-  if ( m_windowStyle & wxSL_LEFT )
-    msStyle |= TBS_LEFT;
-  else if ( m_windowStyle & wxSL_RIGHT )
-      msStyle |= TBS_RIGHT;
-  else if ( m_windowStyle & wxSL_TOP )
-    msStyle |= TBS_TOP;
-  else if ( m_windowStyle & wxSL_BOTTOM )
-    msStyle |= TBS_BOTTOM;
-  else if ( m_windowStyle & wxSL_BOTH )
-    msStyle |= TBS_BOTH;
-  else if ( ! (m_windowStyle & wxSL_AUTOTICKS) )
-    msStyle |= TBS_NOTICKS;
-
-  if ( m_windowStyle & wxSL_SELRANGE )
-    msStyle |= TBS_ENABLESELRANGE ;
-
-  HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), TRACKBAR_CLASS, wxBuffer,
-                         msStyle,
-                         0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
-                         wxGetInstance(), NULL);
-
-  m_rangeMax = maxValue;
-  m_rangeMin = minValue;
-
-  m_pageSize = (int)((maxValue-minValue)/10);
-
-  ::SendMessage(scroll_bar, TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue));
-  ::SendMessage(scroll_bar, TBM_SETPOS, TRUE, (LPARAM)value);
-  ::SendMessage(scroll_bar, TBM_SETPAGESIZE, 0, (LPARAM)m_pageSize);
-
-  m_hWnd = (WXHWND)scroll_bar;
-
-  SubclassWin(GetHWND());
-
-  SetWindowText((HWND) m_hWnd, _T(""));
-
-  SetFont(parent->GetFont());
-
-  if ( m_windowStyle & wxSL_LABELS )
-  {
-      // Finally, create max value static item
-      wxSprintf(wxBuffer, _T("%d"), maxValue);
-      m_staticMax = (WXHWND) CreateWindowEx(0, _T("STATIC"), wxBuffer,
-                             STATIC_FLAGS,
-                             0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
-                             wxGetInstance(), NULL);
-
-
-      if (GetFont().Ok())
-      {
-        if (GetFont().GetResourceHandle())
+bool
+wxSlider::Create(wxWindow *parent,
+                 wxWindowID id,
+                 int value,
+                 int minValue,
+                 int maxValue,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 long style,
+                 const wxValidator& validator,
+                 const wxString& name)
+{
+    // our styles are redundant: wxSL_LEFT/RIGHT imply wxSL_VERTICAL and
+    // wxSL_TOP/BOTTOM imply wxSL_HORIZONTAL, but for backwards compatibility
+    // reasons we can't really change it, instead try to infer the orientation
+    // from the flags given to us here
+    switch ( style & (wxSL_LEFT | wxSL_RIGHT | wxSL_TOP | wxSL_BOTTOM) )
+    {
+        case wxSL_LEFT:
+        case wxSL_RIGHT:
+            style |= wxSL_VERTICAL;
+            break;
+
+        case wxSL_TOP:
+        case wxSL_BOTTOM:
+            style |= wxSL_HORIZONTAL;
+            break;
+
+        case 0:
+            // no specific direction, do we have at least the orientation?
+            if ( !(style & (wxSL_HORIZONTAL | wxSL_VERTICAL)) )
+            {
+                // no, choose default
+                style |= wxSL_BOTTOM | wxSL_HORIZONTAL;
+            }
+    };
+
+    wxASSERT_MSG( !(style & wxSL_VERTICAL) | !(style & wxSL_HORIZONTAL),
+                    _T("incompatible slider direction and orientation") );
+
+
+    // initialize everything
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    // ensure that we have correct values for GetLabelsSize()
+    m_rangeMin = minValue;
+    m_rangeMax = maxValue;
+
+    // create the labels first, so that our DoGetBestSize() could take them
+    // into account
+    //
+    // note that we could simply create 3 wxStaticTexts here but it could
+    // result in some observable side effects at wx level (e.g. the parent of
+    // wxSlider would have 3 more children than expected) and so we prefer not
+    // to do it like this
+    if ( m_windowStyle & wxSL_LABELS )
+    {
+        m_labels = new wxSubwindows(SliderLabel_Last);
+
+        HWND hwndParent = GetHwndOf(parent);
+        for ( size_t n = 0; n < SliderLabel_Last; n++ )

         {
         {

-            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);
+            (*m_labels)[n] = ::CreateWindow
+                               (
+                                    wxT("STATIC"),
+                                    NULL,
+                                    WS_CHILD | WS_VISIBLE | SS_CENTER,
+                                    0, 0, 0, 0,
+                                    hwndParent,
+                                    (HMENU)NewControlId(),
+                                    wxGetInstance(),
+                                    NULL
+                               );

         }
         }

-      }
-  }

 
 

-  SetSize(x, y, width, height);
-  SetValue(value);
+        m_labels->SetFont(GetFont());
+    }
+
+    // now create the main control too
+    if ( !MSWCreateControl(TRACKBAR_CLASS, wxEmptyString, pos, size) )
+        return false;
+
+    // and initialize everything
+    SetRange(minValue, maxValue);
+    SetValue(value);
+    SetPageSize((maxValue - minValue)/10);
+
+    // we need to position the labels correctly if we have them and if
+    // SetSize() hadn't been called before (when best size was determined by
+    // MSWCreateControl()) as in this case they haven't been put in place yet
+    if ( m_labels && size.x != wxDefaultCoord && size.y != wxDefaultCoord )
+    {
+        SetSize(size);
+    }
+
+    return true;
+}
+
+WXDWORD wxSlider::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
+
+    // TBS_HORZ, TBS_RIGHT and TBS_BOTTOM are 0 but do include them for clarity
+    msStyle |= style & wxSL_VERTICAL ? TBS_VERT : TBS_HORZ;
+
+    if ( style & wxSL_BOTH )
+    {
+        // this fully specifies the style combined with TBS_VERT/HORZ above
+        msStyle |= TBS_BOTH;
+    }
+    else // choose one direction
+    {
+        if ( style & wxSL_LEFT )
+            msStyle |= TBS_LEFT;
+        else if ( style & wxSL_RIGHT )
+            msStyle |= TBS_RIGHT;
+        else if ( style & wxSL_TOP )
+            msStyle |= TBS_TOP;
+        else if ( style & wxSL_BOTTOM )
+            msStyle |= TBS_BOTTOM;
+    }
+
+    if ( style & wxSL_AUTOTICKS )
+        msStyle |= TBS_AUTOTICKS;
+    else
+        msStyle |= TBS_NOTICKS;
+
+    if ( style & wxSL_SELRANGE )
+        msStyle |= TBS_ENABLESELRANGE;

 
 

-  return TRUE;
+    return msStyle;

 }
 
 }
 

-bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
-                             WXWORD pos, WXHWND control)
+wxSlider::~wxSlider()

 {
 {

-    int position = 0; // Dummy - not used in this mode
+    delete m_labels;
+}
+
+// ----------------------------------------------------------------------------
+// event handling
+// ----------------------------------------------------------------------------

 
 

-    int nScrollInc;
-    wxEventType scrollEvent = wxEVT_NULL;
+bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
+                           WXWORD wParam,
+                           WXWORD WXUNUSED(pos),
+                           WXHWND control)
+{
+    wxEventType scrollEvent;

     switch ( wParam )
     {
         case SB_TOP:
     switch ( wParam )
     {
         case SB_TOP:

-            nScrollInc = m_rangeMax - position;

             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
         case SB_BOTTOM:
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
         case SB_BOTTOM:

-            nScrollInc = - position;

             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:

-            nScrollInc = - GetLineSize();

             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:
             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:

-            nScrollInc = GetLineSize();

             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:
             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:

-            nScrollInc = -GetPageSize();

             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:
             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:

-            nScrollInc = GetPageSize();

             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBTRACK:
             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBTRACK:

-        case SB_THUMBPOSITION:
-#ifdef __WIN32__
-            nScrollInc = (signed short)pos - position;
-#else // Win16
-            nScrollInc = pos - position;
-#endif // Win32/16

             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 
             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 

-        default:
-            nScrollInc = 0;
-    }
+        case SB_THUMBPOSITION:
+            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+            break;

 
 

-    if ( nScrollInc == 0 )
-    {
-        // no event...
-        return FALSE;
+        case SB_ENDSCROLL:
+            scrollEvent = wxEVT_SCROLL_ENDSCROLL;
+            break;
+
+        default:
+            // unknown scroll event?
+            return false;

     }
 
     }
 

-    int newPos = (int)::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
+    int newPos = ValueInvertOrNot((int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0));

     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it
     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it

-        return TRUE;
+        return true;

     }
 
     SetValue(newPos);
     }
 
     SetValue(newPos);


@@ -260,386 +358,340 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     GetEventHandler()->ProcessEvent(event);
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
     GetEventHandler()->ProcessEvent(event);
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );

+    cevent.SetInt( newPos );

     cevent.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent( cevent );
 }
 
     cevent.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent( cevent );
 }
 

-wxSlider95::~wxSlider95()
+void wxSlider::Command (wxCommandEvent & event)

 {
 {

-    if (m_staticMin)
-      DestroyWindow((HWND) m_staticMin);
-    if (m_staticMax)
-      DestroyWindow((HWND) m_staticMax);
-    if (m_staticValue)
-      DestroyWindow((HWND) m_staticValue);
+    SetValue (event.GetInt());
+    ProcessCommand (event);

 }
 
 }
 

-int wxSlider95::GetValue() const
-{
-  return ::SendMessage((HWND) GetHWND(), TBM_GETPOS, 0, 0);
-}
+// ----------------------------------------------------------------------------
+// geometry stuff
+// ----------------------------------------------------------------------------

 
 

-void wxSlider95::SetValue(int value)
+wxRect wxSlider::GetBoundingBox() const

 {
 {

-  ::SendMessage((HWND) GetHWND(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value);
-  if (m_staticValue)
-  {
-    wxSprintf(wxBuffer, _T("%d"), value);
-    SetWindowText((HWND) m_staticValue, wxBuffer);
-  }
-}
+    // take care not to call our own functions which would call us recursively
+    int x, y, w, h;
+    wxSliderBase::DoGetPosition(&x, &y);
+    wxSliderBase::DoGetSize(&w, &h);

 
 

-void wxSlider95::GetSize(int *width, int *height) const
-{
-  RECT rect;
-  rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+    wxRect rect(x, y, w, h);
+    if ( m_labels )
+    {
+        wxRect lrect = m_labels->GetBoundingBox();
+        GetParent()->ScreenToClient(&lrect.x, &lrect.y);
+        rect.Union(lrect);
+    }

 
 

-  wxFindMaxSize(GetHWND(), &rect);
+    return rect;
+}

 
 

-  if (m_staticMin)
-    wxFindMaxSize(m_staticMin, &rect);
-  if (m_staticMax)
-    wxFindMaxSize(m_staticMax, &rect);
-  if (m_staticValue)
-    wxFindMaxSize(m_staticValue, &rect);
+void wxSlider::DoGetSize(int *width, int *height) const
+{
+    wxRect rect = GetBoundingBox();

 
 

-  *width = rect.right - rect.left;
-  *height = rect.bottom - rect.top;
+    if ( width )
+        *width = rect.width;
+    if ( height )
+        *height = rect.height;

 }
 
 }
 

-void wxSlider95::GetPosition(int *x, int *y) const
-{
-  wxWindow *parent = GetParent();
-  RECT rect;
-  rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
-
-  wxFindMaxSize(GetHWND(), &rect);
-
-  if (m_staticMin)
-    wxFindMaxSize(m_staticMin, &rect);
-  if (m_staticMax)
-    wxFindMaxSize(m_staticMax, &rect);
-  if (m_staticValue)
-    wxFindMaxSize(m_staticValue, &rect);
-
-  // Since we now have the absolute screen coords,
-  // if there's a parent we must subtract its top left corner
-  POINT point;
-  point.x = rect.left;
-  point.y = rect.top;
-  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 wxSlider::DoGetPosition(int *x, int *y) const
+{
+    wxRect rect = GetBoundingBox();
+
+    if ( x )
+        *x = rect.x;
+    if ( y )
+        *y = rect.y;

 }
 
 }
 

-void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+int wxSlider::GetLabelsSize(int *width) const

 {
 {

-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
+    int cy;

 
 

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
+    if ( width )
+    {
+        // find the max label width
+        int wLabelMin, wLabelMax;
+        GetTextExtent(Format(m_rangeMin), &wLabelMin, &cy);
+        GetTextExtent(Format(m_rangeMax), &wLabelMax, &cy);

 
 

-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+        *width = wxMax(wLabelMin, wLabelMax);
+    }
+    else
+    {
+        cy = GetCharHeight();
+    }

 
 

-  wxChar buf[300];
+    return EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+}

 
 

-  int x_offset = x;
-  int y_offset = y;
+void wxSlider::DoMoveWindow(int x, int y, int width, int height)
+{
+    // all complications below are because we need to position the labels,
+    // without them everything is easy
+    if ( !m_labels )
+    {
+        wxSliderBase::DoMoveWindow(x, y, width, height);
+        return;
+    }

 
 

-  int cx;     // slider,min,max sizes
-  int cy;
-  int cyf;
+    // if our parent had prepared a defer window handle for us, use it (unless
+    // we are a top level window)
+    wxWindowMSW *parent = GetParent();

 
 

-  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
+#if USE_DEFERRED_SIZING
+    HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
+#else
+    HDWP hdwp = 0;
+#endif    

 
 

-  if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
-  {
-    if ( m_windowStyle & wxSL_LABELS )
+    // be careful to position the slider itself after moving the labels as
+    // otherwise our GetBoundingBox(), which is called from WM_SIZE handler,
+    // would return a wrong result and wrong size would be cached internally
+    if ( HasFlag(wxSL_VERTICAL) )

     {
     {

-    int min_len = 0;
+        int wLabel;
+        int hLabel = GetLabelsSize(&wLabel);

 
 

-    GetWindowText((HWND) m_staticMin, buf, 300);
-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+        int xLabel = HasFlag(wxSL_LEFT) ? x + width - wLabel : x;

 
 

-    int max_len = 0;
+        // position all labels: min at the top, value in the middle and max at
+        // the bottom
+        wxMoveWindowDeferred(hdwp, this, (*m_labels)[SliderLabel_Min],
+                     xLabel, y, wLabel, hLabel);

 
 

-    GetWindowText((HWND) m_staticMax, buf, 300);
-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
-    if (m_staticValue)
-    {
-      int new_width = (int)(wxMax(min_len, max_len));
-      int valueHeight = (int)cyf;
-#ifdef __WIN32__
-      // For some reason, under Win95, the text edit control has
-      // a lot of space before the first character
-      new_width += 3*cx;
-#endif
-      // The height needs to be a bit bigger under Win95 if using native
-      // 3D effects.
-      valueHeight = (int) (valueHeight * 1.5) ;
-      MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
-      x_offset += new_width + cx;
+        wxMoveWindowDeferred(hdwp, this, (*m_labels)[SliderLabel_Value],
+                     xLabel, y + (height - hLabel)/2, wLabel, hLabel);
+
+        wxMoveWindowDeferred(hdwp, this, (*m_labels)[SliderLabel_Max],
+                     xLabel, y + height - hLabel, wLabel, hLabel);
+
+        // position the slider itself along the left/right edge
+        wxMoveWindowDeferred(hdwp, this, GetHwnd(),
+                     HasFlag(wxSL_LEFT) ? x : x + wLabel + HGAP,
+                     y + hLabel/2,
+                     width - wLabel - HGAP,
+                     height - hLabel);

     }
     }

+    else // horizontal
+    {
+        int wLabel;
+        int hLabel = GetLabelsSize(&wLabel);

 
 

-    MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);
-    x_offset += (int)(min_len + cx);
+        int yLabel = HasFlag(wxSL_TOP) ? y + height - hLabel : y;

 
 

-    int slider_length = (int)(w1 - x_offset - max_len - cx);
+        // position all labels: min on the left, value in the middle and max to
+        // the right
+        wxMoveWindowDeferred(hdwp, this, (*m_labels)[SliderLabel_Min],
+                     x, yLabel, wLabel, hLabel);

 
 

-    int slider_height = h1;
-    if (slider_height < 0 )
-        slider_height = 20;
+        wxMoveWindowDeferred(hdwp, this, (*m_labels)[SliderLabel_Value],
+                     x + (width - wLabel)/2, yLabel, wLabel, hLabel);

 
 

-    // Slider must have a minimum/default length/height
-    if (slider_length < 100)
-      slider_length = 100;
+        wxMoveWindowDeferred(hdwp, this, (*m_labels)[SliderLabel_Max],
+                     x + width - wLabel, yLabel, wLabel, hLabel);

 
 

-    MoveWindow((HWND) GetHWND(), x_offset, y_offset, slider_length, slider_height, TRUE);
-    x_offset += slider_length + cx;
+        // position the slider itself along the top/bottom edge
+        wxMoveWindowDeferred(hdwp, this, GetHwnd(),
+                     x,
+                     HasFlag(wxSL_TOP) ? y : y + hLabel,
+                     width,
+                     height - hLabel);
+    }

 
 

-    MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
+#if USE_DEFERRED_SIZING
+    if ( parent )
+    {
+        // hdwp must be updated as it may have been changed
+        parent->m_hDWP = (WXHANDLE)hdwp;

     }
     }

-    else
+#endif
+}
+
+wxSize wxSlider::DoGetBestSize() const
+{
+    // these values are arbitrary
+    static const int length = 100;
+    static const int thumb = 24;
+    static const int ticks = 8;
+
+    int *width;
+    wxSize size;
+    if ( HasFlag(wxSL_VERTICAL) )

     {
     {

-        // No labels
-        // If we're prepared to use the existing size, then...
-        if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+        size.x = thumb;
+        size.y = length;
+        width = &size.x;
+
+        if ( m_labels )

         {
         {

-            GetSize(&w1, &h1);
+            int wLabel;
+            int hLabel = GetLabelsSize(&wLabel);
+
+            // account for the labels
+            size.x += HGAP + wLabel;
+
+            // labels are indented relative to the slider itself
+            size.y += hLabel;

         }
         }

-        if ( w1 < 0 )
-            w1 = 200;
-        if ( h1 < 0 )
-            h1 = 20;
-        MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);

     }
     }

-  }
-  else
-  {
-    if ( m_windowStyle & wxSL_LABELS )
+    else // horizontal

     {
     {

-    int min_len;
-    GetWindowText((HWND) m_staticMin, buf, 300);
-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+        size.x = length;
+        size.y = thumb;
+        width = &size.y;

 
 

-    int max_len;
-    GetWindowText((HWND) m_staticMax, buf, 300);
-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+        if ( m_labels )
+        {
+            // labels add extra height
+            size.y += GetLabelsSize();
+        }
+    }

 
 

-    if (m_staticValue)
+    // need extra space to show ticks
+    if ( HasFlag(wxSL_TICKS) )

     {
     {

-      int new_width = (int)(wxMax(min_len, max_len));
-      int valueHeight = (int)cyf;
-/*** Suggested change by George Tasker - remove this block...
-#ifdef __WIN32__
-      // For some reason, under Win95, the text edit control has
-      // a lot of space before the first character
-      new_width += 3*cx;
-#endif
- ... and replace with following line: */
-      new_width += cx;
+        *width += ticks;

 
 

-      // The height needs to be a bit bigger under Win95 if using native
-      // 3D effects.
-      valueHeight = (int) (valueHeight * 1.5) ;
-
-      MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
-      y_offset += valueHeight;
+        // and maybe twice as much if we show them on both sides
+        if ( HasFlag(wxSL_BOTH) )
+            *width += ticks;

     }
 
     }
 

-    MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);
-    y_offset += cy;
-
-    int slider_length = (int)(h1 - y_offset - cy - cy);
+    return size;
+}

 
 

-    int slider_width = w1;
-    if (slider_width < 0 )
-        slider_width = 20;
+// ----------------------------------------------------------------------------
+// slider-specific methods
+// ----------------------------------------------------------------------------

 
 

-    // Slider must have a minimum/default length
-    if (slider_length < 100)
-      slider_length = 100;
+int wxSlider::GetValue() const
+{
+    return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0));
+}

 
 

-    MoveWindow((HWND) GetHWND(), x_offset, y_offset, slider_width, slider_length, TRUE);
-    y_offset += slider_length;
+void wxSlider::SetValue(int value)
+{
+    ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));

 
 

-    MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
-    }
-    else
+    if ( m_labels )

     {
     {

-        // 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 )
-            h1 = 200;
-        MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
+        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value));

     }
     }

-  }

 }
 
 }
 

-void wxSlider95::SetRange(int minValue, int maxValue)
+void wxSlider::SetRange(int minValue, int maxValue)

 {
 {

-  m_rangeMin = minValue;
-  m_rangeMax = maxValue;
-
-  ::SendMessage((HWND) GetHWND(), TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue));
+    m_rangeMin = minValue;
+    m_rangeMax = maxValue;

 
 

-  wxChar buf[40];
-  if ( m_staticMin )
-  {
-      wxSprintf(buf, _T("%d"), m_rangeMin);
-      SetWindowText((HWND) m_staticMin, buf);
-  }
+    ::SendMessage(GetHwnd(), TBM_SETRANGEMIN, TRUE, m_rangeMin);
+    ::SendMessage(GetHwnd(), TBM_SETRANGEMAX, TRUE, m_rangeMax);

 
 

-  if ( m_staticMax )
-  {
-    wxSprintf(buf, _T("%d"), m_rangeMax);
-    SetWindowText((HWND) m_staticMax, buf);
-  }
+    if ( m_labels )
+    {
+        ::SetWindowText((*m_labels)[SliderLabel_Min], Format(ValueInvertOrNot(m_rangeMin)));
+        ::SetWindowText((*m_labels)[SliderLabel_Max], Format(ValueInvertOrNot(m_rangeMax)));
+    }

 }
 
 }
 

-WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+void wxSlider::SetTickFreq(int n, int pos)

 {
 {

-  if ( nCtlColor == CTLCOLOR_SCROLLBAR )
-    return 0;
-
-  // 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();
+    m_tickFreq = n;
+    ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );

 }
 
 }
 

-// For trackbars only
-void wxSlider95::SetTickFreq(int n, int pos)
+void wxSlider::SetPageSize(int pageSize)

 {
 {

-  m_tickFreq = n;
-  ::SendMessage( (HWND) GetHWND(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
+    ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
+    m_pageSize = pageSize;

 }
 
 }
 

-void wxSlider95::SetPageSize(int pageSize)
+int wxSlider::GetPageSize() const

 {
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
-  m_pageSize = pageSize;
+    return m_pageSize;

 }
 
 }
 

-int wxSlider95::GetPageSize() const
+void wxSlider::ClearSel()

 {
 {

-  return m_pageSize;
+    ::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0);

 }
 
 }
 

-void wxSlider95::ClearSel()
+void wxSlider::ClearTicks()

 {
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0 );
+    ::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0);

 }
 
 }
 

-void wxSlider95::ClearTicks()
+void wxSlider::SetLineSize(int lineSize)

 {
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 );
+    m_lineSize = lineSize;
+    ::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize);

 }
 
 }
 

-void wxSlider95::SetLineSize(int lineSize)
+int wxSlider::GetLineSize() const

 {
 {

-  m_lineSize = lineSize;
-  ::SendMessage( (HWND) GetHWND(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );
+    return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0);

 }
 
 }
 

-int wxSlider95::GetLineSize() const
+int wxSlider::GetSelEnd() const

 {
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETLINESIZE, (WPARAM) 0, (LPARAM) 0 );
+    return (int)::SendMessage(GetHwnd(), TBM_SETSELEND, 0, 0);

 }
 
 }
 

-int wxSlider95::GetSelEnd() const
+int wxSlider::GetSelStart() const

 {
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_SETSELEND, (WPARAM) 0, (LPARAM) 0 );
+    return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0);

 }
 
 }
 

-int wxSlider95::GetSelStart() const
+void wxSlider::SetSelection(int minPos, int maxPos)

 {
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 );
+    ::SendMessage(GetHwnd(), TBM_SETSEL,
+                  (WPARAM) TRUE /* redraw */,
+                  (LPARAM) MAKELONG( minPos, maxPos) );

 }
 
 }
 

-void wxSlider95::SetSelection(int minPos, int maxPos)
+void wxSlider::SetThumbLength(int len)

 {
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_SETSEL, (WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) );
+    ::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0);

 }
 
 }
 

-void wxSlider95::SetThumbLength(int len)
+int wxSlider::GetThumbLength() const

 {
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );
+    return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0);

 }
 
 }
 

-int wxSlider95::GetThumbLength() const
+void wxSlider::SetTick(int tickPos)

 {
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 );
+    ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );

 }
 
 }
 

-void wxSlider95::SetTick(int tickPos)
-{
-  ::SendMessage( (HWND) GetHWND(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
-}
+// ----------------------------------------------------------------------------
+// composite control methods
+// ----------------------------------------------------------------------------

 
 

-bool wxSlider95::ContainsHWND(WXHWND hWnd) const
+WXHWND wxSlider::GetStaticMin() const

 {
 {

-    return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL;

 }
 
 }
 

-void wxSlider95::Command (wxCommandEvent & event)
+WXHWND wxSlider::GetStaticMax() const

 {
 {

-  SetValue (event.GetInt());
-  ProcessCommand (event);
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL;

 }
 
 }
 

-bool wxSlider95::Show(bool show)
+WXHWND wxSlider::GetEditValue() const

 {
 {

-    wxWindow::Show(show);
-
-    int cshow;
-    if (show)
-        cshow = SW_SHOW;
-    else
-        cshow = SW_HIDE;
-
-    if(m_staticValue)
-        ShowWindow((HWND) m_staticValue, (BOOL)cshow);
-    if(m_staticMin)
-        ShowWindow((HWND) m_staticMin, (BOOL)cshow);
-    if(m_staticMax)
-        ShowWindow((HWND) m_staticMax, (BOOL)cshow);
-    return TRUE;
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;

 }
 
 }
 

-#endif
-  // __WIN95__
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider, wxSliderBase, m_labels)

 
 

+#endif // wxUSE_SLIDER