X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f8f5cf55bf0e71583417d4323bbc79b286070..43c42c18d36c703a88b1b7b697bac27fe5608eca:/src/msw/aboutdlg.cpp?ds=sidebyside diff --git a/src/msw/aboutdlg.cpp b/src/msw/aboutdlg.cpp index 473158c6b8..8524477611 100644 --- a/src/msw/aboutdlg.cpp +++ b/src/msw/aboutdlg.cpp @@ -26,6 +26,7 @@ #if wxUSE_ABOUTDLG #ifndef WX_PRECOMP + #include "wx/msgdlg.h" #endif //WX_PRECOMP #include "wx/aboutdlg.h" @@ -36,7 +37,7 @@ // ============================================================================ // our public entry point -void wxAboutBox(const wxAboutDialogInfo& info) +void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent) { // we prefer to show a simple message box if we don't have any fields which // can't be shown in it because as much as there is a standard about box @@ -48,21 +49,25 @@ void wxAboutBox(const wxAboutDialogInfo& info) wxString msg; msg << name; if ( info.HasVersion() ) - msg << _(" Version ") << info.GetVersion(); - msg << _T('\n'); + { + msg << wxT('\n'); + msg << info.GetLongVersion(); + } + + msg << wxT("\n\n"); if ( info.HasCopyright() ) - msg << info.GetCopyright() << _T('\n'); + msg << info.GetCopyrightToDisplay() << wxT('\n'); // add everything remaining msg << info.GetDescriptionAndCredits(); - wxMessageBox(msg, _T("About ") + name); + wxMessageBox(msg, wxString::Format(_("About %s"), name), wxOK | wxCENTRE, parent); } else // simple "native" version is not enough { // we need to use the full-blown generic version - wxGenericAboutBox(info); + wxGenericAboutBox(info, parent); } }