#include "wx/spinctrl.h"
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/event.h"
#include "wx/textctrl.h"
#endif
#include "wx/msw/private.h"
-#include "wx/msw/wrapcctl.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
// process a WM_COMMAND generated by the buddy text control
bool wxSpinCtrl::ProcessTextCommand(WXWORD cmd, WXWORD WXUNUSED(id))
{
- switch (cmd)
+ if ( cmd == EN_CHANGE )
{
- case EN_CHANGE:
- {
- wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
- event.SetEventObject(this);
- wxString val = wxGetWindowText(m_hwndBuddy);
- event.SetString(val);
- event.SetInt(GetValue());
- return GetEventHandler()->ProcessEvent(event);
- }
- case EN_SETFOCUS:
- case EN_KILLFOCUS:
- {
- wxFocusEvent event(cmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS
- : wxEVT_SET_FOCUS,
- m_windowId);
- event.SetEventObject( this );
- return GetEventHandler()->ProcessEvent(event);
- }
- default:
- break;
+ wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+ event.SetEventObject(this);
+ wxString val = wxGetWindowText(m_hwndBuddy);
+ event.SetString(val);
+ event.SetInt(GetValue());
+ return GetEventHandler()->ProcessEvent(event);
}
// not processed
void wxSpinCtrl::OnKillFocus(wxFocusEvent& event)
{
- // ensure that the value is shown correctly
- SetValue(GetValue()) ;
+ // ensure that a correct value is shown by the control
+ NormalizeValue();
event.Skip();
}
event.Skip();
}
+void wxSpinCtrl::NormalizeValue()
+{
+ int value = GetValue();
+ SetValue( value );
+ if (value != m_oldValue)
+ {
+ wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId() );
+ event.SetEventObject( this );
+ event.SetInt( value );
+ GetEventHandler()->ProcessEvent( event );
+ m_oldValue = value;
+ }
+}
+
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
SetRange(min, max);
SetValue(initial);
+
+ m_oldValue = initial;
// subclass the text ctrl to be able to intercept some events
wxSetWindowUserData(GetBuddyHwnd(), this);
sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
}
- SetBestSize(size);
+ SetInitialSize(size);
(void)::ShowWindow(GetBuddyHwnd(), SW_SHOW);
// current value in the control, so do it manually
::SetWindowText(GetBuddyHwnd(), wxString::Format(_T("%d"), val));
}
+
+ m_oldValue = GetValue();
}
int wxSpinCtrl::GetValue() const
{
wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
event.SetEventObject(this);
- event.SetInt(eventSpin.GetPosition());
-
- (void)GetEventHandler()->ProcessEvent(event);
+ int value = eventSpin.GetPosition();
+ event.SetInt( value );
+
+ if (value != m_oldValue)
+ (void)GetEventHandler()->ProcessEvent(event);
if ( eventSpin.GetSkipped() )
{
event.Skip();
}
+
+ m_oldValue = value;
}
// ----------------------------------------------------------------------------