compilation fix

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

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index ae2d5b4140a04fedf438299fb7ec8126417d9274..24ebec8676a9f32dd3f9f6e9d66a2a238722a873 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -218,18 +218,29 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 #endif
 }
 
 #endif
 }
 

-int wxConsoleAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()

 {
 {

-    return DoGetOSVersion(majorVsn, minorVsn);
+    static wxToolkitInfo info;
+    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.name = _T("wxBase");
+    return info;

 }
 
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
 }
 
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 

-int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-    return DoGetOSVersion(majorVsn, minorVsn);
+    static wxToolkitInfo info;
+    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.shortName = _T("mac");
+    info.name = _T("wxMac");
+#ifdef __WXUNIVERSAL__
+    info.shortName << _T("univ");
+    info.name << _T("/wxUniversal");
+#endif
+    return info;

 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)