Add wxUSE_ARCSTREAM so that other archive classes can be used without wxZip

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 26fa7ab5301d4afe07cd1496fe4e160cdecd127f..f810b795a413196af0015f7de55a079f2d996003 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -101,11 +101,11 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
         switch ( text[pos] )
         {
             case wxT('\n'):
-                if (!line.IsEmpty())
+                if (!line.empty())
                 {
                     wxStaticText *s = new wxStaticText( this, wxID_ANY, line );
                     box->Add( s );
-                    line = wxT("");
+                    line = wxEmptyString;
                 }
                 else
                 {
@@ -148,14 +148,14 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 
                         pos = last_space;
                         last_space = 0;
-                        line = wxT("");
+                        line = wxEmptyString;
                     }
                 }
         }
     }
 
     // remaining text behind last '\n'
-    if (!line.IsEmpty())
+    if (!line.empty())
     {
         wxStaticText *s2 = new wxStaticText( this, wxID_ANY, line );
         box->Add( s2 );
@@ -177,38 +177,36 @@ wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
 {
     wxStdDialogButtonSizer *sizer = new wxStdDialogButtonSizer();
     wxButton *ok = NULL;
-    wxButton *cancel = NULL;
     wxButton *yes = NULL;
     wxButton *no = NULL;
-    wxButton *help = NULL;
-    
+
     if (flags & wxOK){
-       ok = new wxButton(this, wxID_OK, _("OK"));
-       sizer->AddButton(ok);
+        ok = new wxButton(this, wxID_OK);
+        sizer->AddButton(ok);
     }
-    
+
     if (flags & wxCANCEL){
-       cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
-       sizer->AddButton(cancel);       
+        wxButton *cancel = new wxButton(this, wxID_CANCEL);
+        sizer->AddButton(cancel);
     }
-    
+
     if (flags & wxYES){
-       yes = new wxButton(this, wxID_YES, _("Yes"));
-       sizer->AddButton(yes);
+        yes = new wxButton(this, wxID_YES);
+        sizer->AddButton(yes);
     }
-    
+
     if (flags & wxNO){
-       no = new wxButton(this, wxID_NO, _("No"));
-       sizer->AddButton(no);
+        no = new wxButton(this, wxID_NO);
+        sizer->AddButton(no);
     }
-    
+
     if (flags & wxHELP){
-       help = new wxButton(this, wxID_HELP, _("Help"));
-       sizer->AddButton(help);
+        wxButton *help = new wxButton(this, wxID_HELP);
+        sizer->AddButton(help);
     }
-    
+
     sizer->Finalise();
-           
+
     if (flags & wxNO_DEFAULT)
     {
         if (no)