diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 4c64ade837..c00ed843eb 100644
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -424,7 +424,6 @@ private:
     void Init()
     {
         m_digits = 0;
-        m_format = wxASCII_STR("%0.0f");
     }
 
     // Update m_digits and m_format to correspond to the given increment.
diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 7255045e24..8048e72682 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -778,8 +778,13 @@ void wxSpinCtrlDouble::DetermineDigits(double inc)
     if ( inc > 0.0 && inc < 1.0 )
     {
         m_digits = wxMin(SPINCTRLDBL_MAX_DIGITS, -static_cast<int>(floor(log10(inc))));
-        m_format.Printf("%%0.%ulf", m_digits);
     }
+    else
+    {
+        m_digits = 0;
+    }
+
+    m_format.Printf("%%0.%ulf", m_digits);
 }
 
 #endif // wxUSE_SPINBTN