Fix crash when using a proxy (m_protocol already gets cleaned up via CleanData())

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 23b79ecad214e4c7249763bd5f9ab4d78d7b3c98..ca535d37d294ac90993c7dee404eb23f16228b33 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -105,7 +105,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
                 {
                     wxStaticText *s = new wxStaticText( this, wxID_ANY, line );
                     box->Add( s );
-                    line = wxT("");
+                    line = wxEmptyString;
                 }
                 else
                 {
@@ -148,7 +148,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 
                         pos = last_space;
                         last_space = 0;
-                        line = wxT("");
+                        line = wxEmptyString;
                     }
                 }
         }
@@ -181,31 +181,31 @@ wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
     wxButton *no = NULL;
 
     if (flags & wxOK){
-        ok = new wxButton(this, wxID_OK, _("OK"));
+        ok = new wxButton(this, wxID_OK);
         sizer->AddButton(ok);
     }
 
     if (flags & wxCANCEL){
-        wxButton *cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
+        wxButton *cancel = new wxButton(this, wxID_CANCEL);
         sizer->AddButton(cancel);
     }
 
     if (flags & wxYES){
-        yes = new wxButton(this, wxID_YES, _("Yes"));
+        yes = new wxButton(this, wxID_YES);
         sizer->AddButton(yes);
     }
 
     if (flags & wxNO){
-        no = new wxButton(this, wxID_NO, _("No"));
+        no = new wxButton(this, wxID_NO);
         sizer->AddButton(no);
     }
 
     if (flags & wxHELP){
-        wxButton *help = new wxButton(this, wxID_HELP, _("Help"));
+        wxButton *help = new wxButton(this, wxID_HELP);
         sizer->AddButton(help);
     }
 
-    sizer->Finalise();
+    sizer->Realize();
 
     if (flags & wxNO_DEFAULT)
     {