wxLongLongWx::Assign(double) works - thanks Guillermo

[wxWidgets.git] / src / generic / numdlgg.cpp

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 0bcafcdc6094567e374e7e34b6abc050b75b0f1d..e0d39f71535c3a91aeec279a9c3751dead7a3354 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma interface "numdlgg.h"
-    #pragma implementation "numdlgg.h"
+    #pragma interface "numdlgg.cpp"
+    #pragma implementation "numdlgg.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -50,6 +50,11 @@
 // this is where wxGetNumberFromUser() is declared
 #include "wx/generic/textdlgg.h"
 
+#if !wxUSE_SPINCTRL
+    // wxTextCtrl will do instead of wxSpinCtrl if we don't have it
+    #define wxSpinCtrl wxTextCtrl
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -124,6 +129,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     wxString valStr;
     valStr.Printf(wxT("%lu"), m_value);
     m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
+    m_spinctrl->SetRange((int)m_min, (int)m_max);
     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
     // add both
     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
@@ -151,7 +157,14 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 
 void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
+#if !wxUSE_SPINCTRL
+    wxString tmp = m_spinctrl->GetValue();
+    if ( wxSscanf(tmp, _T("%ld"), &m_value) != 1 )
+        m_value = -1;
+    else
+#else
     m_value = m_spinctrl->GetValue();
+#endif
     if ( m_value < m_min || m_value > m_max )
     {
         // not a number or out of range