Support encodings in wxGTK_CONV_BACK() in the same way as we do it in

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

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index a8882e40433acb8ae23469824d7a73393d0bf0c1..e10de2b8936d3a5608906724fd77ec9f8782e574 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -269,7 +269,7 @@ void wxSpinCtrl::OnSetFocus(wxFocusEvent& event)
 void wxSpinCtrl::NormalizeValue()
 {
     const int value = GetValue();
-    const bool changed = value == m_oldValue;
+    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
@@ -278,11 +278,7 @@ void wxSpinCtrl::NormalizeValue()
 
     if ( changed )
     {
-        wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
-        event.SetEventObject(this);
-        event.SetInt(value);
-        GetEventHandler()->ProcessEvent(event);
-        m_oldValue = value;
+        SendSpinUpdate(value);
     }
 }
 
@@ -299,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)
@@ -371,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);
@@ -403,6 +401,14 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // 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);
@@ -546,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 );
+    event.SetInt(value);
+
+    (void)GetEventHandler()->ProcessEvent(event);
 
-    if (value != m_oldValue)
-        (void)GetEventHandler()->ProcessEvent(event);
+    m_oldValue = value;
+}
 
-    if ( eventSpin.GetSkipped() )
+void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin)
+{
+    const int value = eventSpin.GetPosition();
+    if ( value != m_oldValue )
     {
-        event.Skip();
+        SendSpinUpdate(value);
     }
-
-    m_oldValue = value;
 }
 
 // ----------------------------------------------------------------------------