Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows
Update valid value on kill focus By peter1079 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -109,11 +109,12 @@ wxCONSTRUCTOR_6( wxSpinCtrl , wxWindow* , Parent , wxWindowID , Id , wxString ,
|
|||||||
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
|
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//pmg EVT_KILL_FOCUS
|
||||||
BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
|
BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
|
||||||
EVT_CHAR(wxSpinCtrl::OnChar)
|
EVT_CHAR(wxSpinCtrl::OnChar)
|
||||||
|
|
||||||
EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
|
EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
|
||||||
|
EVT_KILL_FOCUS(wxSpinCtrl::OnKillFocus)
|
||||||
EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)
|
EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
@@ -262,6 +263,13 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
|
|||||||
event.Skip();
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxSpinCtrl::OnKillFocus(wxFocusEvent& event)
|
||||||
|
{
|
||||||
|
// ensure that the value is shown correctly
|
||||||
|
SetValue(GetValue()) ;
|
||||||
|
event.Skip();
|
||||||
|
}
|
||||||
|
|
||||||
void wxSpinCtrl::OnSetFocus(wxFocusEvent& event)
|
void wxSpinCtrl::OnSetFocus(wxFocusEvent& event)
|
||||||
{
|
{
|
||||||
// when we get focus, give it to our buddy window as it needs it more than
|
// when we get focus, give it to our buddy window as it needs it more than
|
||||||
|
Reference in New Issue
Block a user