fixed animate in Unicode mode and removed use of deprecated methods

[wxWidgets.git] / src / mac / utils.cpp

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 18e1822aa127034c29c4770625a1e79ce7a6fd6c..345bbe9a4e8643bb6112803f8da4c58deb94442d 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -17,6 +17,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/apptrait.h"
 #include "wx/mac/uma.h"
 
 #include <ctype.h>
@@ -192,7 +193,11 @@ void wxBell()
     SysBeep(30);
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+#else
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+#endif
 {
     long theSystem ;
 
@@ -212,6 +217,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 #endif
 }
 
+
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
@@ -860,8 +866,7 @@ void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncodi
 
     #include <CodeFragments.h>
 
-    EXTERN_API_C( long )
-    CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+    extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
 
     ProcPtr gCallUniversalProc_Proc = NULL;