extending calculation of visible region

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

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index b125b4d2880bd73f6317710b13293da55d865b2c..e9ef27266a675f93e470c75a0c17852023357287 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
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,8 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma interface "numdlgg.cpp"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "numdlgg.cpp"
 #endif
 
@@ -29,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_NUMBERDLG
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
 
@@ -45,45 +46,18 @@
   #include "wx/statline.h"
 #endif
 
+#if !defined(__WIN16__) && wxUSE_SPINCTRL
 #include "wx/spinctrl.h"
+#endif
 
 // this is where wxGetNumberFromUser() is declared
-#include "wx/textdlgg.h"
+#include "wx/numdlg.h"
 
 #if !wxUSE_SPINCTRL
     // wxTextCtrl will do instead of wxSpinCtrl if we don't have it
     #define wxSpinCtrl wxTextCtrl
 #endif
 
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxNumberEntryDialog : public wxDialog
-{
-public:
-    wxNumberEntryDialog(wxWindow *parent,
-                        const wxString& message,
-                        const wxString& prompt,
-                        const wxString& caption,
-                        long value, long min, long max,
-                        const wxPoint& pos);
-
-    long GetValue() const { return m_value; }
-
-    // implementation only
-    void OnOK(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-protected:
-    wxSpinCtrl *m_spinctrl;
-
-    long m_value, m_min, m_max;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -97,6 +71,8 @@ BEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel)
 END_EVENT_TABLE()
 
+IMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog)
+
 wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
                                          const wxString& message,
                                          const wxString& prompt,
@@ -127,9 +103,11 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
         inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 );
     // spin ctrl
     wxString valStr;
-    valStr.Printf(wxT("%lu"), m_value);
+    valStr.Printf(wxT("%ld"), 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 );
     // add both
     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
@@ -150,6 +128,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 
     Centre( wxBOTH );
 
+    m_spinctrl->SetSelection(-1, -1);
     m_spinctrl->SetFocus();
 
     wxEndBusyCursor();
@@ -160,7 +139,7 @@ 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;
+        EndModal(wxID_CANCEL);
     else
 #else
     m_value = m_spinctrl->GetValue();
@@ -168,7 +147,7 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     if ( m_value < m_min || m_value > m_max )
     {
         // not a number or out of range
-        m_value = -1;
+        EndModal(wxID_CANCEL);
     }
 
     EndModal(wxID_OK);
@@ -176,8 +155,6 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 
 void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
-    m_value = -1;
-
     EndModal(wxID_CANCEL);
 }
 
@@ -198,7 +175,10 @@ long wxGetNumberFromUser(const wxString& msg,
 {
     wxNumberEntryDialog dialog(parent, msg, prompt, title,
                                value, min, max, pos);
-    (void)dialog.ShowModal();
-
+    if (dialog.ShowModal() == wxID_OK)
     return dialog.GetValue();
+    
+    return -1;
 }
+
+#endif // wxUSE_NUMBERDLG