fixed MSWGetBgBrush() call, it needs a HWND and not wxWindow * now

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

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index a88446e8c6c7a61bee0a44cbd633f6a35826a0c9..02319d7e7bc947091aa0327fa7e65fca46d123db 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     22.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) Vadim Zeitlin
+// Copyright:   (c) 1999-2005 Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -35,14 +35,13 @@
 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

-#if defined(__WIN95__)
-

 #include "wx/spinctrl.h"
 #include "wx/msw/private.h"
 #include "wx/spinctrl.h"
 #include "wx/msw/private.h"

+#include "wx/msw/wrapcctl.h"

 
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#endif
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS

 
 #include <limits.h>         // for INT_MIN
 
 
 #include <limits.h>         // for INT_MIN
 


@@ -436,6 +435,9 @@ int wxSpinCtrl::GetValue() const
     long n;
     if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
         n = INT_MIN;
     long n;
     if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
         n = INT_MIN;

+        
+    if (n < m_min) n = m_min;
+    if (n > m_max) n = m_max;

 
     return n;
 }
 
     return n;
 }


@@ -499,6 +501,18 @@ void wxSpinCtrl::SetFocus()
     ::SetFocus(GetBuddyHwnd());
 }
 
     ::SetFocus(GetBuddyHwnd());
 }
 

+#if wxUSE_TOOLTIPS
+
+void wxSpinCtrl::DoSetToolTip(wxToolTip *tip)
+{
+    wxSpinButton::DoSetToolTip(tip);
+
+    if ( tip )
+        tip->Add(m_hwndBuddy);
+}
+
+#endif // wxUSE_TOOLTIPS
+

 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------


@@ -590,8 +604,5 @@ void wxSpinCtrl::DoGetPosition(int *x, int *y) const
     wxConstCast(this, wxSpinCtrl)->m_hWnd = hWnd;
 }
 
     wxConstCast(this, wxSpinCtrl)->m_hWnd = hWnd;
 }
 

-#endif // __WIN95__
-
-#endif
-       // wxUSE_SPINCTRL
+#endif // wxUSE_SPINCTRL