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 25a324e74ba952d5bce0260bf76f1f05e970779e..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;
 }
@@ -95,10 +95,10 @@ wxIcon wxAboutDialogInfo::GetIcon() const
 }
 
 // ----------------------------------------------------------------------------
-// wxAboutDialog
+// wxGenericAboutDialog
 // ----------------------------------------------------------------------------
 
-bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
+bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
 {
     // TODO: should we use main frame as parent by default here?
     if ( !wxDialog::Create(NULL, wxID_ANY, _("About ") + info.GetName()) )
@@ -135,6 +135,8 @@ bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
 
     // TODO: add credits (developers, artists, doc writers, translators)
 
+    DoAddCustomControls();
+
 
     wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL);
 #if wxUSE_STATBMP
@@ -149,22 +151,43 @@ bool wxAboutDialog::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;
 }
 
-void wxAboutDialog::AddControl(wxWindow *win)
+void wxGenericAboutDialog::AddControl(wxWindow *win, const wxSizerFlags& flags)
 {
     wxCHECK_RET( m_sizerText, _T("can only be called after Create()") );
     wxASSERT_MSG( win, _T("can't add NULL window to about dialog") );
 
-    m_sizerText->Add(win, wxSizerFlags().Border(wxDOWN).Centre());
+    m_sizerText->Add(win, flags);
+}
+
+void wxGenericAboutDialog::AddControl(wxWindow *win)
+{
+    AddControl(win, wxSizerFlags().Border(wxDOWN).Centre());
 }
 
-void wxAboutDialog::AddText(const wxString& text)
+void wxGenericAboutDialog::AddText(const wxString& text)
 {
     if ( !text.empty() )
         AddControl(new wxStaticText(this, wxID_ANY, text));
@@ -176,7 +199,7 @@ void wxAboutDialog::AddText(const wxString& text)
 
 void wxGenericAboutBox(const wxAboutDialogInfo& info)
 {
-    wxAboutDialog dlg(info);
+    wxGenericAboutDialog dlg(info);
     dlg.ShowModal();
 }