Fix for mingw32 compilation (replaced #ifdef NM_CUSTOMDRAW with a test for _WIN32_IE

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 9f93deb0b6bdf6ec522083b6037708b9c03e1a83..deafa898b21535fcea7cbe040a8a518364843cf5 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
     #pragma implementation "spinbutt.h"
 #endif
@@ -27,19 +35,31 @@
 // Can't resolve reference to CreateUpDownControl in
 // TWIN32, but could probably use normal CreateWindow instead.
 
+#if wxUSE_SPINBTN
+
 #if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include "wx/spinbutt.h"
 #include "wx/msw/private.h"
 
-#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
     #include <commctrl.h>
 #endif
 
-#if !USE_SHARED_LIBRARY
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
-#endif
+
+// ----------------------------------------------------------------------------
+// wxSpinButton
+// ----------------------------------------------------------------------------
 
 bool wxSpinButton::Create(wxWindow *parent,
                           wxWindowID id,
@@ -48,70 +68,108 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
-  wxSystemSettings settings;
-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
-
-  SetName(name);
+    // basic initialization
+    InitBase();
 
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    m_windowId = (id == -1) ? NewControlId() : id;
 
-  m_windowStyle = style;
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;
 
-  SetParent(parent);
+    SetName(name);
 
-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;
 
-  InitBase();
+    m_windowStyle = style;
 
-  m_windowId = (id == -1) ? NewControlId() : id;
+    SetParent(parent);
 
-  DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
-
-  if ( m_windowStyle & wxSP_HORIZONTAL )
-    wstyle |= UDS_HORZ;
-  if ( m_windowStyle & wxSP_ARROW_KEYS )
-    wstyle |= UDS_ARROWKEYS;
-  if ( m_windowStyle & wxSP_WRAP )
-    wstyle |= UDS_WRAP;
+    // get the right size for the control
+    if ( width <= 0 || height <= 0 )
+    {
+        wxSize size = DoGetBestSize();
+        if ( width <= 0 )
+            width = size.x;
+        if ( height <= 0 )
+            height = size.y;
+    }
 
-  // Create the ListView control.
-  HWND hWndListControl = CreateUpDownControl(wstyle,
-    x, y, width, height,
-    (HWND) parent->GetHWND(),
-    m_windowId,
-    wxGetInstance(),
-    0,
-    m_min, m_max, m_min);
+    if ( x < 0 )
+        x = 0;
+    if ( y < 0 )
+        y = 0;
+
+    // translate the styles
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
+                   UDS_SETBUDDYINT; // it doesn't harm if we don't have buddy
+
+    if ( m_windowStyle & wxSP_HORIZONTAL )
+        wstyle |= UDS_HORZ;
+    if ( m_windowStyle & wxSP_ARROW_KEYS )
+        wstyle |= UDS_ARROWKEYS;
+    if ( m_windowStyle & wxSP_WRAP )
+        wstyle |= UDS_WRAP;
+
+    // create the UpDown control.
+    m_hWnd = (WXHWND)CreateUpDownControl
+                     (
+                       wstyle,
+                       x, y, width, height,
+                       GetHwndOf(parent),
+                       m_windowId,
+                       wxGetInstance(),
+                       NULL, // no buddy
+                       m_max, m_min,
+                       m_min // initial position
+                     );
+
+    if ( !m_hWnd )
+    {
+        wxLogLastError("CreateUpDownControl");
 
-  m_hWnd = (WXHWND) hWndListControl;
-  if (parent) parent->AddChild(this);
+        return FALSE;
+    }
 
-  // TODO: have this for all controls.
-  if ( !m_hWnd )
-    return FALSE;
+    if ( parent )
+    {
+        parent->AddChild(this);
+    }
 
-  SubclassWin((WXHWND) m_hWnd);
+    SubclassWin(m_hWnd);
 
-  return TRUE;
+    return TRUE;
 }
 
 wxSpinButton::~wxSpinButton()
 {
 }
 
+// ----------------------------------------------------------------------------
+// size calculation
+// ----------------------------------------------------------------------------
+
+wxSize wxSpinButton::DoGetBestSize() const
+{
+    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
+    {
+        // vertical control
+        return wxSize(GetSystemMetrics(SM_CXVSCROLL),
+                      2*GetSystemMetrics(SM_CYVSCROLL));
+    }
+    else
+    {
+        // horizontal control
+        return wxSize(2*GetSystemMetrics(SM_CXHSCROLL),
+                      GetSystemMetrics(SM_CYHSCROLL));
+    }
+}
+
+// ----------------------------------------------------------------------------
 // Attributes
-////////////////////////////////////////////////////////////////////////////
+// ----------------------------------------------------------------------------
 
 int wxSpinButton::GetValue() const
 {
@@ -133,7 +191,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
                                WXWORD pos, WXHWND control)
 {
-    wxCHECK_MSG( control, FALSE, _T("scrolling what?") )
+    wxCHECK_MSG( control, FALSE, wxT("scrolling what?") )
 
     if ( wParam != SB_THUMBPOSITION )
     {
@@ -150,7 +208,14 @@ bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
 
 bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
+#ifndef __GNUWIN32__
+#if defined(__BORLANDC__) || defined(__WATCOMC__)
+    LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
+#elif defined(__VISUALC__) && (__VISUALC__ >= 1000) && (__VISUALC__ < 1020)
+    LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
+#else
     LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
+#endif
 
     wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP
                                          : wxEVT_SCROLL_LINEDOWN,
@@ -163,6 +228,9 @@ bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     *result = event.IsAllowed() ? 0 : 1;
 
     return processed;
+#else // GnuWin32
+    return FALSE;
+#endif
 }
 
 bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
@@ -172,3 +240,7 @@ bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
 }
 
 #endif // __WIN95__
+
+#endif
+    // wxUSE_SPINCTN
+