regenerated after version.bkl changes fixing -compatibility_version for Darwin

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

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index a4455a0b922810631c5d20feebdb023b2b20875d..d91c69e2a5deaed252f9f5666c359ea43f308578 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -17,10 +17,6 @@
 // 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"
 
@@ -105,15 +101,20 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     wxBeginBusyCursor();
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-
+#if wxUSE_STATTEXT
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+#endif        
 
     // 2) prompt and text ctrl
     wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
+
+#if wxUSE_STATTEXT
     // prompt if any
     if (!prompt.IsEmpty())
         inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
+#endif
+        
     // spin ctrl
     wxString valStr;
     valStr.Printf(wxT("%ld"), m_value);
@@ -145,10 +146,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     SetSizer( topsizer );
     SetAutoLayout( true );
 
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
+#endif
 
     m_spinctrl->SetSelection(-1, -1);
     m_spinctrl->SetFocus();
@@ -169,6 +172,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);
     }
 
@@ -198,7 +202,7 @@ long wxGetNumberFromUser(const wxString& msg,
     wxNumberEntryDialog dialog(parent, msg, prompt, title,
                                value, min, max, pos);
     if (dialog.ShowModal() == wxID_OK)
-    return dialog.GetValue();
+        return dialog.GetValue();
 
     return -1;
 }