diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index da35c8cdb1..aa583904bb 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -88,7 +88,7 @@ bool wxNumberEntryDialog::Create(wxWindow *parent,
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 #if wxUSE_STATTEXT
     // 1) text message
-    topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+    topsizer->Add( CreateTextSizer( message ), wxSizerFlags().DoubleBorder() );
 #endif
 
     // 2) prompt and text ctrl
@@ -97,7 +97,8 @@ bool wxNumberEntryDialog::Create(wxWindow *parent,
 #if wxUSE_STATTEXT
     // prompt if any
     if (!prompt.empty())
-        inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
+        inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ),
+                         wxSizerFlags().Center().DoubleBorder(wxLEFT) );
 #endif
 
     // spin ctrl
@@ -108,9 +109,9 @@ bool wxNumberEntryDialog::Create(wxWindow *parent,
 #else
     m_spinctrl = new wxTextCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ));
 #endif
-    inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
+    inputsizer->Add( m_spinctrl, wxSizerFlags(1).Center().DoubleBorder(wxLEFT | wxRIGHT));
     // add both
-    topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 );
+    topsizer->Add( inputsizer, wxSizerFlags().Expand().Border(wxLEFT | wxRIGHT));
 
     // 3) buttons if any
     wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL);
diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index d199aca3e4..dd6dfe5d0c 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -85,13 +85,9 @@ bool wxTextEntryDialog::Create(wxWindow *parent,
     m_value = value;
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-
-    wxSizerFlags flagsBorder2;
-    flagsBorder2.DoubleBorder();
-
 #if wxUSE_STATTEXT
     // 1) text message
-    topsizer->Add(CreateTextSizer(message), flagsBorder2);
+    topsizer->Add(CreateTextSizer(message), wxSizerFlags().DoubleBorder());
 #endif
 
     // 2) text ctrl: create it with wxTE_RICH2 style to allow putting more than
@@ -112,7 +108,7 @@ bool wxTextEntryDialog::Create(wxWindow *parent,
     wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL));
     if ( buttonSizer )
     {
-        topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand());
+        topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
     }
 
     SetSizer( topsizer );