no changes, just replaced C comment with a C++ one

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

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index 4543ada040583e50825e789f90144218913c0609..21a6a057543264aeef4e441099f12db189645674 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -27,9 +27,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/sizer.h"
-
     #include "wx/statbmp.h"
     #include "wx/stattext.h"
+    #include "wx/button.h"
 #endif //WX_PRECOMP
 
 #include "wx/aboutdlg.h"
@@ -69,13 +69,13 @@ wxString wxAboutDialogInfo::GetDescriptionAndCredits() const
         s << _T('\n') << _("Developed by ") << AllAsString(GetDevelopers());
 
     if ( HasDocWriters() )
-        s << _T('\n') << ("Documentation by ") << AllAsString(GetDocWriters());
+        s << _T('\n') << _("Documentation by ") << AllAsString(GetDocWriters());
 
     if ( HasArtists() )
-        s << _T('\n') << ("Graphics art by ") << AllAsString(GetArtists());
+        s << _T('\n') << _("Graphics art by ") << AllAsString(GetArtists());
 
     if ( HasTranslators() )
-        s << _T('\n') << ("Translations by ") << AllAsString(GetTranslators());
+        s << _T('\n') << _("Translations by ") << AllAsString(GetTranslators());
 
     return s;
 }
@@ -151,10 +151,26 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
-    sizerTop->Add(new wxButton(this, wxID_OK), wxSizerFlags().Right().Border());
+
+    int defBorder = wxSizerFlags().Border().GetBorderInPixels();
+    wxSizer *buttonSizer = CreateButtonSizer( wxOK , false, defBorder );
+    if(buttonSizer->GetChildren().GetCount() > 0 )
+    {
+        sizerTop->Add( buttonSizer, 0, wxEXPAND | wxALL, defBorder );
+    }
+    else
+    {
+        sizerTop->AddSpacer( defBorder );
+        delete buttonSizer;
+    }
+
     SetSizerAndFit(sizerTop);
 
     CentreOnScreen();
+
+    wxWindow *ok = FindWindow(wxID_OK);
+    if (ok) ok->SetFocus();
+
     return true;
 }