Don't overwrite status message when restoring it if it changed.

[wxWidgets.git] / src / msw / aboutdlg.cpp

diff --git a/src/msw/aboutdlg.cpp b/src/msw/aboutdlg.cpp
index 1d8823b816cf5db8db493d271b73b07d379598ec..1259a214e75581293385d97fafc7b0e53dcaf1c6 100644 (file)
--- a/src/msw/aboutdlg.cpp
+++ b/src/msw/aboutdlg.cpp
@@ -37,7 +37,7 @@
 // ============================================================================
 
 // our public entry point
 // ============================================================================
 
 // 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
 {
     // 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


@@ -49,21 +49,25 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         wxString msg;
         msg << name;
         if ( info.HasVersion() )
         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() )
 
         if ( info.HasCopyright() )

-            msg << info.GetCopyright() << _T('\n');
+            msg << info.GetCopyrightToDisplay() << wxT('\n');

 
         // add everything remaining
         msg << info.GetDescriptionAndCredits();
 
 
         // add everything remaining
         msg << info.GetDescriptionAndCredits();
 

-        wxMessageBox(msg, _("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
     }
     else // simple "native" version is not enough
     {
         // we need to use the full-blown generic version

-        wxGenericAboutBox(info);
+        wxGenericAboutBox(info, parent);

     }
 }
 
     }
 }