app traits support and CW Debug output fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 2148fc488624e7c67d67738dca5ee13c6fb34f59..345bbe9a4e8643bb6112803f8da4c58deb94442d 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -193,7 +193,11 @@ void wxBell()
     SysBeep(30);
 }
 
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+#else
 int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+#endif
 {
     long theSystem ;
 
@@ -213,6 +217,7 @@ int wxGUIAppTraits::GetOSVersion(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)
@@ -861,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;
 

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 2148fc488624e7c67d67738dca5ee13c6fb34f59..345bbe9a4e8643bb6112803f8da4c58deb94442d 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -193,7 +193,11 @@ void wxBell()
     SysBeep(30);
 }
 
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+#else
 int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+#endif
 {
     long theSystem ;
 
@@ -213,6 +217,7 @@ int wxGUIAppTraits::GetOSVersion(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)
@@ -861,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;