move wxGridCellRenderer::Draw before other derived classes implementations (no real...

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

diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp
index 243de8b7d7b2a1a69358fdf82a8d417ba4ca8b01..9188a221c71aab70d60e18aecc88922969683086 100644 (file)
--- a/src/osx/carbon/aboutdlg.cpp
+++ b/src/osx/carbon/aboutdlg.cpp
@@ -27,7 +27,7 @@
 #include "wx/aboutdlg.h"
 #include "wx/generic/aboutdlgg.h"
 
 #include "wx/aboutdlg.h"
 #include "wx/generic/aboutdlgg.h"
 

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 
 // helper class for HIAboutBox options
 class AboutBoxOptions : public wxCFRef<CFMutableDictionaryRef>
 
 // helper class for HIAboutBox options
 class AboutBoxOptions : public wxCFRef<CFMutableDictionaryRef>


@@ -61,7 +61,7 @@ void wxAboutBox(const wxAboutDialogInfo& info)
     // Mac native about box currently can show only name, version, copyright
     // and description fields and we also shoehorn the credits text into the
     // description but if we have anything else we must use the generic version
     // Mac native about box currently can show only name, version, copyright
     // and description fields and we also shoehorn the credits text into the
     // description but if we have anything else we must use the generic version

-#ifndef __LP64__
+

     if ( info.IsSimple() )
     {
         AboutBoxOptions opts;
     if ( info.IsSimple() )
     {
         AboutBoxOptions opts;


@@ -75,14 +75,13 @@ void wxAboutBox(const wxAboutDialogInfo& info)
         }
 
         if ( info.HasCopyright() )
         }
 
         if ( info.HasCopyright() )

-            opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyright());
+            opts.Set(kHIAboutBoxCopyrightKey, info.GetCopyrightToDisplay());

 
         opts.Set(kHIAboutBoxDescriptionKey, info.GetDescriptionAndCredits());
 
         HIAboutBox(opts);
     }
     else // simple "native" version is not enough
 
         opts.Set(kHIAboutBoxDescriptionKey, info.GetDescriptionAndCredits());
 
         HIAboutBox(opts);
     }
     else // simple "native" version is not enough

-#endif

     {
         // we need to use the full-blown generic version
         wxGenericAboutBox(info);
     {
         // we need to use the full-blown generic version
         wxGenericAboutBox(info);