/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: msw/spinbutt.cpp
// 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
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "spinbutt.h"
+ #pragma implementation "spinbutbase.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#endif
#ifndef WX_PRECOMP
- #include "wx/wx.h"
+#include "wx/app.h"
#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"
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
+
+#if defined(__WIN95__)
+
#include "wx/msw/private.h"
-#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
#include <commctrl.h>
#endif
// wxWin macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
- IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSpinButtonStyle )
+
+wxBEGIN_FLAGS( wxSpinButtonStyle )
+ // 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(wxSP_HORIZONTAL)
+ wxFLAGS_MEMBER(wxSP_VERTICAL)
+ wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
+ wxFLAGS_MEMBER(wxSP_WRAP)
+
+wxEND_FLAGS( wxSpinButtonStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
+ wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxSpinEvent )
+
+ wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( Min , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxSpinButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSpinButton)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
#endif
+
+
// ----------------------------------------------------------------------------
// wxSpinButton
// ----------------------------------------------------------------------------
const wxString& name)
{
// basic initialization
- InitBase();
-
- m_windowId = (id == -1) ? NewControlId() : id;
-
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
+ m_windowId = (id == wxID_ANY) ? NewControlId() : id;
SetName(name);
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
+ 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 )
if ( !m_hWnd )
{
- wxLogLastError("CreateUpDownControl");
+ wxLogLastError(wxT("CreateUpDownControl"));
- return FALSE;
+ return false;
}
if ( parent )
SubclassWin(m_hWnd);
- return TRUE;
+ SetBestSize(size);
+
+ return true;
}
wxSpinButton::~wxSpinButton()
// size calculation
// ----------------------------------------------------------------------------
-wxSize wxSpinButton::DoGetBestSize()
+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));
- }
+ return GetBestSpinerSize( (GetWindowStyle() & wxSP_VERTICAL) != 0 );
}
// ----------------------------------------------------------------------------
int wxSpinButton::GetValue() const
{
- return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));
+ int n;
+#ifdef UDM_GETPOS32
+ if ( wxTheApp->GetComCtl32Version() >= 580 )
+ {
+ // use the full 32 bit range if available
+ n = ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0);
+ }
+ else
+#endif // UDM_GETPOS32
+ {
+ // we're limited to 16 bit
+ n = (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));
+ }
+
+ if (n < m_min) n = m_min;
+ if (n > m_max) n = m_max;
+
+ return n;
}
void wxSpinButton::SetValue(int val)
{
- ::SendMessage(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)
{
wxSpinButtonBase::SetRange(minVal, maxVal);
- ::SendMessage(GetHwnd(), UDM_SETRANGE, 0,
- (LPARAM) MAKELONG((short)maxVal, (short)minVal));
+
+#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)
{
- wxCHECK_MSG( control, FALSE, wxT("scrolling what?") )
+ wxCHECK_MSG( control, false, wxT("scrolling what?") )
if ( wParam != SB_THUMBPOSITION )
{
// probable SB_ENDSCROLL - we don't react to it
- return FALSE;
+ return false;
}
wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
return GetEventHandler()->ProcessEvent(event);
}
-bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
+bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
{
-#ifndef __GNUWIN32__
-#ifdef __BORLANDC__
- LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
-#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
- LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
-#else
- LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
-#endif
+ NM_UPDOWN *lpnmud = (NM_UPDOWN *)lParam;
+
+ if (lpnmud->hdr.hwndFrom != GetHwnd()) // make sure it is the right control
+ return false;
wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP
: wxEVT_SCROLL_LINEDOWN,
*result = event.IsAllowed() ? 0 : 1;
return processed;
-#else // GnuWin32
- return FALSE;
-#endif
}
-bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
+bool wxSpinButton::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD WXUNUSED(id))
{
// No command messages
- return FALSE;
+ return false;
}
#endif // __WIN95__
+
+#endif // wxUSE_SPINBTN
projects / wxWidgets.git / blobdiff