re-enable using our own resize grip with GTK3, themes can (and do) disable the native...

[wxWidgets.git] / src / osx / carbon / aboutdlg.cpp

diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp
index 81cff671e58e9e3584ba1e207dfa9f25bec2ef56..0ca668b1ffee6309e2ce5281599592349a300e7d 100644 (file)
--- a/src/osx/carbon/aboutdlg.cpp
+++ b/src/osx/carbon/aboutdlg.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        mac/carbon/aboutdlg.cpp
+// Name:        src/osx/carbon/aboutdlg.cpp

 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08


@@ -56,7 +56,7 @@ public:
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
+void wxAboutBox(const wxAboutDialogInfo& info, wxWindow *parent)

 {
     // Mac native about box currently can show only name, version, copyright
     // and description fields and we also shoehorn the credits text into the
 {
     // Mac native about box currently can show only name, version, copyright
     // and description fields and we also shoehorn the credits text into the


@@ -69,10 +69,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
         opts.Set(kHIAboutBoxNameKey, info.GetName());
 
         if ( info.HasVersion() )
         opts.Set(kHIAboutBoxNameKey, info.GetName());
 
         if ( info.HasVersion() )

-        {
-            opts.Set(kHIAboutBoxVersionKey,
-                     wxString::Format(_("Version %s"), info.GetVersion()));
-        }
+            opts.Set(kHIAboutBoxVersionKey,info.GetLongVersion());

 
         if ( info.HasCopyright() )
             opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyrightToDisplay());
 
         if ( info.HasCopyright() )
             opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyrightToDisplay());


@@ -84,7 +81,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(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);

     }
 }
 
     }
 }