signed/unsigned comparison warning fixed

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

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index c6100c88ffcd862523c3bcb89b44c8b0c7ac692a..c5d186384e4ad64a626159c4bf2367a441d2a493 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     23.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     23.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -18,8 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma interface "numdlgg.h"
-    #pragma implementation "numdlgg.h"
+    #pragma implementation "numdlgg.cpp"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -29,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_NUMBERDLG
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 


@@ -45,8 +46,17 @@
   #include "wx/statline.h"
 #endif
 
   #include "wx/statline.h"
 #endif
 

+#if !defined(__WIN16__) && wxUSE_SPINCTRL
+#include "wx/spinctrl.h"
+#endif
+

 // this is where wxGetNumberFromUser() is declared
 // 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
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -69,12 +79,13 @@ public:
     void OnCancel(wxCommandEvent& event);
 
 protected:
     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;
 
 private:
     DECLARE_EVENT_TABLE()
 
     long m_value, m_min, m_max;
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxNumberEntryDialog)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -107,12 +118,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     m_min = min;
 
     wxBeginBusyCursor();
     m_min = min;
 
     wxBeginBusyCursor();

-    
+

     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
     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
     // 2) prompt and text ctrl
     wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
     // prompt if any


@@ -120,10 +131,13 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
         inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 );
     // spin ctrl
     wxString valStr;
         inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 );
     // spin ctrl
     wxString valStr;

-    valStr.Printf(_T("%lu"), m_value);
-    m_spinctrl = new wxTextCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
+    valStr.Printf(wxT("%lu"), m_value);
+    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 );
     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );

-    // add both    
+    // add both

     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 
 #if wxUSE_STATLINE
     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 
 #if wxUSE_STATLINE


@@ -133,7 +147,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 
     // 4) buttons
     topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
 
     // 4) buttons
     topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );

-    
+

     SetSizer( topsizer );
     SetAutoLayout( TRUE );
 
     SetSizer( topsizer );
     SetAutoLayout( TRUE );
 


@@ -147,10 +161,17 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     wxEndBusyCursor();
 }
 
     wxEndBusyCursor();
 }
 

-void wxNumberEntryDialog::OnOK(wxCommandEvent& event)
+void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))

 {
 {

-    if ( (wxSscanf(m_spinctrl->GetValue(), _T("%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;
     {
         // not a number or out of range
         m_value = -1;


@@ -159,7 +180,7 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& event)
     EndModal(wxID_OK);
 }
 
     EndModal(wxID_OK);
 }
 

-void wxNumberEntryDialog::OnCancel(wxCommandEvent& event)
+void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
     m_value = -1;
 
 {
     m_value = -1;
 


@@ -187,3 +208,5 @@ long wxGetNumberFromUser(const wxString& msg,
 
     return dialog.GetValue();
 }
 
     return dialog.GetValue();
 }

+
+#endif // wxUSE_NUMBERDLG