X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e8dba5e29eba7ac5e53fa4035e65ceeaeed3884..823b6635f6be00ef24a858b9766c601d9227b920:/src/msw/spinctrl.cpp

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 8f4bd81c89..e10de2b893 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -111,7 +111,6 @@ wxCONSTRUCTOR_6( wxSpinCtrl , wxWindow* , Parent , wxWindowID , Id , wxString ,
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 #endif
 
-//pmg EVT_KILL_FOCUS
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
 
@@ -269,15 +268,17 @@ void wxSpinCtrl::OnSetFocus(wxFocusEvent& event)
 
 void wxSpinCtrl::NormalizeValue()
 {
-    int value = GetValue();
-    SetValue( value );
-    if (value != m_oldValue)
+    const int value = GetValue();
+    const bool changed = value != m_oldValue;
+
+    // notice that we have to call SetValue() even if the value didn't change
+    // because otherwise we could be left with empty buddy control when value
+    // is 0, see comment in SetValue()
+    SetValue(value);
+
+    if ( changed )
     {
-        wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId() );
-        event.SetEventObject( this );
-        event.SetInt( value );
-        GetEventHandler()->ProcessEvent( event );
-        m_oldValue = value;
+        SendSpinUpdate(value);
     }
 }
 
@@ -294,6 +295,11 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         int min, int max, int initial,
                         const wxString& name)
 {
+    // this should be in ctor/init function but I don't want to add one to 2.8
+    // to avoid problems with default ctor which can be inlined in the user
+    // code and so might not get this fix without recompilation
+    m_oldValue = INT_MIN;
+
     // before using DoGetBestSize(), have to set style to let the base class
     // know whether this is a horizontal or vertical control (we're always
     // vertical)
@@ -366,10 +372,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         return false;
     }
 
-    SetRange(min, max);
-    SetValue(initial);
-    
-    m_oldValue = initial;
+    wxSpinButtonBase::SetRange(min, max);
 
     // subclass the text ctrl to be able to intercept some events
     wxSetWindowUserData(GetBuddyHwnd(), this);
@@ -391,13 +394,21 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
     }
 
-    SetBestSize(size);
+    SetInitialSize(size);
 
     (void)::ShowWindow(GetBuddyHwnd(), SW_SHOW);
 
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
 
+    SetValue(initial);
+
+    // Set the range in the native control
+    SetRange(min, max);
+
+    // Send the initial event
+    SendSpinUpdate(initial);
+
     if ( !value.empty() )
     {
         SetValue(value);
@@ -449,6 +460,8 @@ void  wxSpinCtrl::SetValue(int val)
         // current value in the control, so do it manually
         ::SetWindowText(GetBuddyHwnd(), wxString::Format(_T("%d"), val));
     }
+
+    m_oldValue = GetValue();
 }
 
 int wxSpinCtrl::GetValue() const
@@ -539,25 +552,27 @@ void wxSpinCtrl::DoSetToolTip(wxToolTip *tip)
 #endif // wxUSE_TOOLTIPS
 
 // ----------------------------------------------------------------------------
-// event processing
+// events processing and generation
 // ----------------------------------------------------------------------------
 
-void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin)
+void wxSpinCtrl::SendSpinUpdate(int value)
 {
     wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
     event.SetEventObject(this);
-    int value = eventSpin.GetPosition();
-    event.SetInt( value );
-    
-    if (value != m_oldValue)
-        (void)GetEventHandler()->ProcessEvent(event);
+    event.SetInt(value);
+
+    (void)GetEventHandler()->ProcessEvent(event);
 
-    if ( eventSpin.GetSkipped() )
+    m_oldValue = value;
+}
+
+void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin)
+{
+    const int value = eventSpin.GetPosition();
+    if ( value != m_oldValue )
     {
-        event.Skip();
+        SendSpinUpdate(value);
     }
-    
-    m_oldValue = value;
 }
 
 // ----------------------------------------------------------------------------