cleanup code

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

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index c88afa638c57ba00ab24a751629bc42639fa56d7..9fa5693a4d41c9ba2379577eb6f3b9ca4b9832c4 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -18,8 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma interface "numdlgg.h"
-    #pragma implementation "numdlgg.h"
+    #pragma implementation "numdlgg.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -29,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_NUMBERDLG
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
 
@@ -45,8 +46,17 @@
   #include "wx/statline.h"
 #endif
 
+#if !defined(__WIN16__) && wxUSE_SPINCTRL
+#include "wx/spinctrl.h"
+#endif
+
 // this is where wxGetNumberFromUser() is declared
-#include "wx/generic/textdlgg.h"
+#include "wx/textdlg.h"
+
+#if !wxUSE_SPINCTRL
+    // wxTextCtrl will do instead of wxSpinCtrl if we don't have it
+    #define wxSpinCtrl wxTextCtrl
+#endif
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -69,7 +79,7 @@ public:
     void OnCancel(wxCommandEvent& event);
 
 protected:
-    wxTextCtrl *m_spinctrl; // TODO replace it with wxSpinCtrl once it's done
+    wxSpinCtrl *m_spinctrl;
 
     long m_value, m_min, m_max;
 
@@ -107,12 +117,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     m_min = min;
 
     wxBeginBusyCursor();
-    
+
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
-    
+
     // 2) prompt and text ctrl
     wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
     // prompt if any
@@ -121,9 +131,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     // spin ctrl
     wxString valStr;
     valStr.Printf(wxT("%lu"), m_value);
-    m_spinctrl = new wxTextCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
+    m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
+#if !defined(__WIN16__) && wxUSE_SPINCTRL
+    m_spinctrl->SetRange((int)m_min, (int)m_max);
+#endif
     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
-    // add both    
+    // add both
     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 
 #if wxUSE_STATLINE
@@ -133,7 +146,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 
     // 4) buttons
     topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
-    
+
     SetSizer( topsizer );
     SetAutoLayout( TRUE );
 
@@ -149,8 +162,15 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 
 void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
-    if ( (wxSscanf(m_spinctrl->GetValue(), wxT("%lu"), &m_value) != 1) ||
-         (m_value < m_min) || (m_value > m_max) )
+#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
         m_value = -1;
@@ -187,3 +207,5 @@ long wxGetNumberFromUser(const wxString& msg,
 
     return dialog.GetValue();
 }
+
+#endif // wxUSE_NUMBERDLG