Moved wxToolBarSimple to deprecated library

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index e1efced86ed5b434a3e148b7337fda7ca534760a..36de18694d0e79dced4ec7e2857eb8738989b5f2 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -1,16 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.cpp
+// Name:        msw/spinbutt.cpp

 // Purpose:     wxSpinButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxSpinButton
 // 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
+// Licence:     wxWindows licence

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

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

     #pragma implementation "spinbutt.h"
     #pragma implementation "spinbutt.h"

+    #pragma implementation "spinbutbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -21,179 +30,267 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+#include "wx/app.h"

 #endif
 
 #endif
 

-// Can't resolve reference to CreateUpDownControl in
-// TWIN32, but could probably use normal CreateWindow instead.
-
-#if defined(__WIN95__) && !defined(__TWIN32__)
+#if wxUSE_SPINBTN

 
 #include "wx/spinbutt.h"
 
 #include "wx/spinbutt.h"

+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
+
+#if defined(__WIN95__)
+

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

-#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxSpinButton)
+       WX_PROPERTY( Value , int , SetValue, GetValue, 0 )
+       WX_PROPERTY( Min , int , SetMin, GetMin, 0 )
+       WX_PROPERTY( Max , int , SetMax, GetMax, 0 )
+/*
+       TODO PROPERTIES
+               style wxSP_VERTICAL | wxSP_ARROW_KEYS
+*/
+WX_END_PROPERTIES_TABLE()
+
+WX_BEGIN_HANDLERS_TABLE(wxSpinButton)
+WX_END_HANDLERS_TABLE()
+
+WX_CONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)

 #endif
 
 #endif
 

-wxSpinButton::wxSpinButton()
-{
-    m_min = 0;
-    m_max = 100;
-}

 
 

-bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name)
+
+// ----------------------------------------------------------------------------
+// wxSpinButton
+// ----------------------------------------------------------------------------
+
+bool wxSpinButton::Create(wxWindow *parent,
+                          wxWindowID id,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name)

 {
 {

-  wxSystemSettings settings;
-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
-
-  SetName(name);
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  m_windowStyle = style;
-
-  SetParent(parent);
-
-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
-
-  m_min = 0;
-  m_max = 100;
-
-  m_windowId = (id == -1) ? NewControlId() : id;
-
-  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;
-
-  // 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);
-
-  m_hWnd = (WXHWND) hWndListControl;
-  if (parent) parent->AddChild(this);
-
-  // TODO: have this for all controls.
-  if ( !m_hWnd )
-    return FALSE;
-  
-  SubclassWin((WXHWND) m_hWnd);
+    // basic initialization
+    InitBase();
+
+    m_windowId = (id == -1) ? NewControlId() : id;
+
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;

 
 

-  return TRUE;
+    SetName(name);
+
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;
+
+    m_windowStyle = style;
+
+    SetParent(parent);
+
+    // 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;
+    }
+
+    if ( x < 0 )
+        x = 0;
+    if ( y < 0 )
+        y = 0;
+
+    // translate the styles
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | /*  WS_CLIPSIBLINGS | */
+                   UDS_NOTHOUSANDS | // never useful, sometimes harmful
+                   UDS_SETBUDDYINT;  // it doesn't harm if we don't have buddy
+
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+    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(wxT("CreateUpDownControl"));
+
+        return FALSE;
+    }
+
+    if ( parent )
+    {
+        parent->AddChild(this);
+    }
+
+    SubclassWin(m_hWnd);
+
+    return TRUE;

 }
 
 wxSpinButton::~wxSpinButton()
 {
 }
 
 }
 
 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
 // Attributes

-////////////////////////////////////////////////////////////////////////////
+// ----------------------------------------------------------------------------

 
 int wxSpinButton::GetValue() const
 {
 
 int wxSpinButton::GetValue() const
 {

-    return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0);
+#ifdef UDM_GETPOS32
+    if ( wxTheApp->GetComCtl32Version() >= 580 )
+    {
+        // use the full 32 bit range if available
+        return ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0);
+    }
+#endif // UDM_GETPOS32
+
+    // we're limited to 16 bit
+    return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));

 }
 
 void wxSpinButton::SetValue(int val)
 {
 }
 
 void wxSpinButton::SetValue(int val)
 {

-    ::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0));
+    // wxSpinButtonBase::SetValue(val); -- no, it is pure virtual
+
+#ifdef UDM_SETPOS32
+    if ( wxTheApp->GetComCtl32Version() >= 580 )
+    {
+        // use the full 32 bit range if available
+        ::SendMessage(GetHwnd(), UDM_SETPOS32, 0, val);
+    }
+    else // we're limited to 16 bit
+#endif // UDM_SETPOS32
+    {
+        ::SendMessage(GetHwnd(), UDM_SETPOS, 0, MAKELONG((short) val, 0));
+    }

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {

-    m_min = minVal;
-    m_max = maxVal;
-    ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0,
-                   (LPARAM) MAKELONG((short)maxVal, (short)minVal));
+    wxSpinButtonBase::SetRange(minVal, maxVal);
+
+#ifdef UDM_SETRANGE32
+    if ( wxTheApp->GetComCtl32Version() >= 471 )
+    {
+        // use the full 32 bit range if available
+        ::SendMessage(GetHwnd(), UDM_SETRANGE32, minVal, maxVal);
+    }
+    else // we're limited to 16 bit
+#endif // UDM_SETRANGE32
+    {
+        ::SendMessage(GetHwnd(), UDM_SETRANGE, 0,
+                      (LPARAM) MAKELONG((short)maxVal, (short)minVal));
+    }

 }
 
 }
 

-bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
+bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,

                                WXWORD pos, WXHWND control)
 {
                                WXWORD pos, WXHWND control)
 {

-    if ( !control )
-        return FALSE;
-
-    wxSpinEvent event(wxEVT_NULL, m_windowId);
-    event.SetPosition(pos);
-    event.SetOrientation(orientation);
-    event.SetEventObject(this);
+    wxCHECK_MSG( control, FALSE, wxT("scrolling what?") )

 
 

-    switch ( wParam )
+    if ( wParam != SB_THUMBPOSITION )

     {
     {

-        case SB_TOP:
-            event.m_eventType = wxEVT_SCROLL_TOP;
-            break;
+        // probable SB_ENDSCROLL - we don't react to it
+        return FALSE;
+    }

 
 

-        case SB_BOTTOM:
-            event.m_eventType = wxEVT_SCROLL_BOTTOM;
-            break;
+    wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
+    event.SetPosition((short)pos);    // cast is important for negative values!
+    event.SetEventObject(this);

 
 

-        case SB_LINEUP:
-            event.m_eventType = wxEVT_SCROLL_LINEUP;
-            break;
+    return GetEventHandler()->ProcessEvent(event);
+}

 
 

-        case SB_LINEDOWN:
-            event.m_eventType = wxEVT_SCROLL_LINEDOWN;
-            break;
+bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
+{
+    NM_UPDOWN *lpnmud = (NM_UPDOWN *)lParam;

 
 

-        case SB_PAGEUP:
-            event.m_eventType = wxEVT_SCROLL_PAGEUP;
-            break;
+    if (lpnmud->hdr.hwndFrom != GetHwnd()) // make sure it is the right control
+        return FALSE;

 
 

-        case SB_PAGEDOWN:
-            event.m_eventType = wxEVT_SCROLL_PAGEDOWN;
-            break;
+    wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP
+                                         : wxEVT_SCROLL_LINEDOWN,
+                      m_windowId);
+    event.SetPosition(lpnmud->iPos + lpnmud->iDelta);
+    event.SetEventObject(this);

 
 

-        case SB_THUMBTRACK:
-        case SB_THUMBPOSITION:
-            event.m_eventType = wxEVT_SCROLL_THUMBTRACK;
-            break;
+    bool processed = GetEventHandler()->ProcessEvent(event);

 
 

-        default:
-            return FALSE;
-    }
+    *result = event.IsAllowed() ? 0 : 1;

 
 

-    return GetEventHandler()->ProcessEvent(event);
+    return processed;

 }
 
 }
 

-bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
+bool wxSpinButton::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD WXUNUSED(id))

 {
     // No command messages
     return FALSE;
 }
 
 {
     // No command messages
     return FALSE;
 }
 

-// Spin event
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
+#endif // __WIN95__

 
 

-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id)
-           : wxScrollEvent(commandType, id)
-{
-}
+#endif
+    // wxUSE_SPINCTN

 
 

-#endif // __WIN95__