cleanup for 10.5

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

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index d6567fe1384e13d36b5e1625e77ba617cb9e2703..615b64ba0f2c4b82b652316b99a6a127a966c0a4 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        numdlgg.cpp
+// Name:        src/generic/numdlgg.cpp

 // Purpose:     wxGetNumberFromUser implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Purpose:     wxGetNumberFromUser implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

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

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


@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma interface "numdlgg.h"
-    #pragma implementation "numdlgg.h"
-#endif
-

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


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

+#if wxUSE_NUMBERDLG
+

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


@@ -45,37 +42,17 @@
   #include "wx/statline.h"
 #endif
 
   #include "wx/statline.h"
 #endif
 

-// this is where wxGetNumberFromUser() is declared
-#include "wx/generic/textdlgg.h"
-
-// ----------------------------------------------------------------------------
-// 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:
-    wxTextCtrl *m_spinctrl; // TODO replace it with wxSpinCtrl once it's done
+#if wxUSE_SPINCTRL
+#include "wx/spinctrl.h"
+#endif

 
 

-    long m_value, m_min, m_max;
+// this is where wxGetNumberFromUser() is declared
+#include "wx/numdlg.h"

 
 

-private:
-    DECLARE_EVENT_TABLE()
-};
+#if !wxUSE_SPINCTRL
+    // wxTextCtrl will do instead of wxSpinCtrl if we don't have it
+    #define wxSpinCtrl wxTextCtrl
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -90,6 +67,8 @@ BEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel)
 END_EVENT_TABLE()
 
     EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel)
 END_EVENT_TABLE()
 

+IMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog)
+

 wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
                                          const wxString& message,
                                          const wxString& prompt,
 wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
                                          const wxString& message,
                                          const wxString& prompt,


@@ -98,50 +77,57 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
                                          long min,
                                          long max,
                                          const wxPoint& pos)
                                          long min,
                                          long max,
                                          const wxPoint& pos)

-                   : wxDialog(parent, -1, caption,
-                              pos, wxDefaultSize,
-                              wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL )
+                   : wxDialog(parent, wxID_ANY, caption,
+                              pos, wxDefaultSize)

 {
     m_value = value;
     m_max = max;
     m_min = min;
 
     wxBeginBusyCursor();
 {
     m_value = value;
     m_max = max;
     m_min = min;
 
     wxBeginBusyCursor();

-    
-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

 
 

+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+#if wxUSE_STATTEXT

     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );

-    
+#endif
+

     // 2) prompt and text ctrl
     wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
     // 2) prompt and text ctrl
     wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );

+
+#if wxUSE_STATTEXT

     // prompt if any
     // prompt if any

-    if (!prompt.IsEmpty())
-        inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 );
+    if (!prompt.empty())
+        inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
+#endif
+

     // spin ctrl
     wxString valStr;
     // spin ctrl
     wxString valStr;

-    valStr.Printf(T("%lu"), m_value);
-    m_spinctrl = new wxTextCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
+    valStr.Printf(wxT("%ld"), m_value);
+    m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ) );
+#if 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    
-    topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
+    // add both
+    topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 );

 
 

-#if wxUSE_STATLINE
-    // 3) static line
-    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+    // 3) buttons if any
+    wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL);
+    if ( buttonSizer )
+    {
+        topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
+    }

 
 

-    // 4) buttons
-    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
-    

     SetSizer( topsizer );
     SetSizer( topsizer );

-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );

 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
 
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
 

+    m_spinctrl->SetSelection(-1, -1);

     m_spinctrl->SetFocus();
 
     wxEndBusyCursor();
     m_spinctrl->SetFocus();
 
     wxEndBusyCursor();


@@ -149,11 +135,19 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 
 void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(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 )
+        EndModal(wxID_CANCEL);
+    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;

+        EndModal(wxID_CANCEL);

     }
 
     EndModal(wxID_OK);
     }
 
     EndModal(wxID_OK);


@@ -161,8 +155,6 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 
 void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxNumberEntryDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {

-    m_value = -1;
-

     EndModal(wxID_CANCEL);
 }
 
     EndModal(wxID_CANCEL);
 }
 


@@ -183,7 +175,10 @@ long wxGetNumberFromUser(const wxString& msg,
 {
     wxNumberEntryDialog dialog(parent, msg, prompt, title,
                                value, min, max, pos);
 {
     wxNumberEntryDialog dialog(parent, msg, prompt, title,
                                value, min, max, pos);

-    (void)dialog.ShowModal();
+    if (dialog.ShowModal() == wxID_OK)
+        return dialog.GetValue();

 
 

-    return dialog.GetValue();
+    return -1;

 }
 }

+
+#endif // wxUSE_NUMBERDLG