X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/073478b3d0586ffc056578831a6676d2306cff48..4df78dc36e933fb1c3aa7c9d7ae2757a898ae05c:/src/generic/numdlgg.cpp

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index bea91d2583..c6100c88ff 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -48,35 +48,6 @@
 // this is where wxGetNumberFromUser() is declared
 #include "wx/generic/textdlgg.h"
 
-static void wxSplitMessage2( const wxString &message, wxWindow *parent, wxSizer* sizer )
-{
-    wxString line;
-    for (size_t pos = 0; pos < message.Len(); pos++)
-    {
-        if (message[pos] == _T('\n'))
-        {
-            if (!line.IsEmpty())
-            {
-                wxStaticText *s1 = new wxStaticText( parent, -1, line );
-		sizer->Add( s1 );
-                line = _T("");
-            }
-        }
-        else
-        {
-            line += message[pos];
-        }
-    }
-    
-    // remaining text behind last '\n'
-    if (!line.IsEmpty())
-    {
-        wxStaticText *s2 = new wxStaticText( parent, -1, line );
-	sizer->Add( s2 );
-    }
-}
-
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -129,7 +100,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
                                          const wxPoint& pos)
                    : wxDialog(parent, -1, caption,
                               pos, wxDefaultSize,
-                              wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
+                              wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL )
 {
     m_value = value;
     m_max = max;
@@ -137,15 +108,13 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
 
     wxBeginBusyCursor();
     
-    wxBox *topsizer = new wxBox( wxVERTICAL );
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
-    wxBox *textsizer = new wxBox( wxVERTICAL );
-    wxSplitMessage2( message, this, textsizer );
-    topsizer->Add( textsizer, 0, wxALL, 10 );
-
+    topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+    
     // 2) prompt and text ctrl
-    wxBox *inputsizer = new wxBox( wxHORIZONTAL );
+    wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
     // prompt if any
     if (!prompt.IsEmpty())
         inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 );
@@ -162,36 +131,17 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
 #endif
 
-
     // 4) buttons
-    wxBox *buttonsizer = new wxBox( wxHORIZONTAL );
-
-    wxButton *ok = (wxButton *) NULL;
-//    if (style & wxOK)
-    {
-        ok = new wxButton( this, wxID_OK, _("OK") );
-	buttonsizer->Add( ok, 0, wxLEFT|wxRIGHT, 10 );
-    }
-
-    wxButton *cancel = (wxButton *) NULL;
-//    if (style & wxCANCEL) 
-    {
-        cancel = new wxButton( this, wxID_CANCEL, _("Cancel") );
-	buttonsizer->Add( cancel, 0, wxLEFT|wxRIGHT, 10 );
-    }
+    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
     
-    topsizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 );
+    SetSizer( topsizer );
+    SetAutoLayout( TRUE );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
-    SetSizer( topsizer );
-    SetAutoLayout( TRUE );
 
     Centre( wxBOTH );
 
-    if (ok)
-        ok->SetDefault();
-
     m_spinctrl->SetFocus();
 
     wxEndBusyCursor();