use IMPLEMENT_APP_CONSOLE and not IMPLEMENT_APP for console apps

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

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 2aa9f3300f5801109ec7fec14921a24a708bffb5..98e5c16734c49700e11cfed1a376031008cb2c0d 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxGetNumberFromUser implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxGetNumberFromUser implementation
 // Author:      Vadim Zeitlin
 // Modified by:


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "numdlgg.cpp"
-#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"
 


@@ -81,7 +77,8 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
                                          long min,
                                          long max,
                                          const wxPoint& pos)
                                          long min,
                                          long max,
                                          const wxPoint& pos)

-                   : wxDialog(parent, wxID_ANY, caption,
+                   : wxDialog(GetParentForModalDialog(parent),
+                              wxID_ANY, caption,

                               pos, wxDefaultSize)
 {
     m_value = value;
                               pos, wxDefaultSize)
 {
     m_value = value;


@@ -91,33 +88,34 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     wxBeginBusyCursor();
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     wxBeginBusyCursor();
 
     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())
+    if (!prompt.empty())

         inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
         inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );

+#endif
+

     // spin ctrl
     wxString valStr;
     valStr.Printf(wxT("%ld"), m_value);
     // spin ctrl
     wxString valStr;
     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
+    m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ), wxSP_ARROW_KEYS, (int)m_min, (int)m_max, (int)m_value);

     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
     // add both
     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
     // add both

-    topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
+    topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 );

 
 

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

 
     SetSizer( topsizer );
     SetAutoLayout( true );
 
     SetSizer( topsizer );
     SetAutoLayout( true );


@@ -146,6 +144,7 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     if ( m_value < m_min || m_value > m_max )
     {
         // not a number or out of range
     if ( m_value < m_min || m_value > m_max )
     {
         // not a number or out of range

+        m_value = -1;

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


@@ -175,7 +174,7 @@ long wxGetNumberFromUser(const wxString& msg,
     wxNumberEntryDialog dialog(parent, msg, prompt, title,
                                value, min, max, pos);
     if (dialog.ShowModal() == wxID_OK)
     wxNumberEntryDialog dialog(parent, msg, prompt, title,
                                value, min, max, pos);
     if (dialog.ShowModal() == wxID_OK)

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

 
     return -1;
 }
 
     return -1;
 }