Add some version checks to help compiling on OSX.

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

diff --git a/src/msw/aboutdlg.cpp b/src/msw/aboutdlg.cpp
index 5f556453fe5a4f6b472777cfec969e692eef9f5e..85244776113f85432665f7c9ccea0a5c7be2a6d2 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


@@ -50,24 +50,24 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         msg << name;
         if ( info.HasVersion() )
         {
         msg << name;
         if ( info.HasVersion() )
         {

-            msg << _T('\n');
-            msg << wxString::Format(_("Version %s"), info.GetVersion());
+            msg << wxT('\n');
+            msg << info.GetLongVersion();

         }
 
         }
 

-        msg << _T("\n\n");
+        msg << wxT("\n\n");

 
         if ( info.HasCopyright() )
 
         if ( info.HasCopyright() )

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

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

-        wxMessageBox(msg, wxString::Format(_("About %s"), 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);

     }
 }
 
     }
 }