X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce96b7a010101e59a1a1c5b63fae52fb8231f367..9f7948af90ec2e3b907944e7d979f0863910c5c8:/src/msw/slidrmsw.cpp

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 1bb9b0876d..48cfaf922a 100644
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "slidrmsw.h"
 #endif
 
@@ -41,7 +41,6 @@ wxSliderMSW::wxSliderMSW()
   m_lineSize = 1;
   m_rangeMax = 0;
   m_rangeMin = 0;
-  m_tickFreq = 0;
 }
 
 bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
@@ -51,8 +50,13 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_NONE;
+
   SetName(name);
+#if wxUSE_VALIDATORS
   SetValidator(validator);
+#endif // wxUSE_VALIDATORS
 
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
@@ -64,7 +68,6 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   m_pageSize = 1;
   m_lineSize = 1;
   m_windowStyle = style;
-  m_tickFreq = 0;
 
   if ( id == -1 )
       m_windowId = (int)NewControlId();
@@ -77,11 +80,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   // non-Win95 implementation
-  
-  long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
 
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+  long msStyle = SS_CENTER;
+
+  WXDWORD exStyle = 0;
+  msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
 
   m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,
                            msStyle,
@@ -89,22 +92,23 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
                            wxGetInstance(), NULL);
 
   // Now create min static control
-  wxSprintf(wxBuffer, wxT("%d"), minValue);
-  m_staticMin = (WXHWND) CreateWindowEx(0, wxT("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);
 
-  // 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 ;
 
-  HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxBuffer,
+  HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString,
                          msStyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
@@ -123,9 +127,12 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   SubclassWin(GetHWND());
 
   // Finally, create max value static item
-  wxSprintf(wxBuffer, wxT("%d"), maxValue);
-  m_staticMax = (WXHWND) CreateWindowEx(0, wxT("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);
 
@@ -229,6 +236,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     GetEventHandler()->ProcessEvent(event);
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+    cevent.SetInt( newPos );
     cevent.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent( cevent );
@@ -254,8 +262,9 @@ void wxSliderMSW::SetValue(int value)
   ::SetScrollPos(GetHwnd(), SB_CTL, value, TRUE);
   if (m_staticValue)
   {
-    wxSprintf(wxBuffer, wxT("%d"), value);
-    SetWindowText((HWND) m_staticValue, wxBuffer);
+    wxString buf;
+    buf.Printf(wxT("%d"), value);
+    SetWindowText((HWND) m_staticValue, buf);
   }
 }
 
@@ -482,11 +491,6 @@ WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
   return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
 }
 
-// For trackbars only
-void wxSliderMSW::SetTickFreq(int n, int pos)
-{
-}
-
 void wxSliderMSW::SetPageSize(int pageSize)
 {
   m_pageSize = pageSize;
@@ -497,14 +501,6 @@ int wxSliderMSW::GetPageSize() const
   return m_pageSize;
 }
 
-void wxSliderMSW::ClearSel()
-{
-}
-
-void wxSliderMSW::ClearTicks()
-{
-}
-
 void wxSliderMSW::SetLineSize(int lineSize)
 {
   m_lineSize = lineSize;
@@ -515,31 +511,15 @@ int wxSliderMSW::GetLineSize() const
   return m_lineSize;
 }
 
-int wxSliderMSW::GetSelEnd() const
-{
-  return 0;
-}
-
-int wxSliderMSW::GetSelStart() const
-{
-  return 0;
-}
-
-void wxSliderMSW::SetSelection(int minPos, int maxPos)
-{
-}
-
-void wxSliderMSW::SetThumbLength(int len)
+// Not yet implemented
+void wxSliderMSW::SetThumbLength(int WXUNUSED(lenPixels))
 {
 }
 
+// Not yet implemented
 int wxSliderMSW::GetThumbLength() const
 {
-  return 0;
-}
-
-void wxSliderMSW::SetTick(int tickPos)
-{
+    return 0;
 }
 
 bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const