Added dash support

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

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 6e1bd0d1b41a714b83c9bfdc4afe87ce4e5932de..4301e543230deb1f4f2cf4d1ea1c04bb7cc129c8 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -218,29 +218,29 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 #endif
 }
 
-wxToolkitInfo *wxConsoleAppTraits::GetToolkitInfo()
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
-    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.name = _T("wxBase");
-    return &info;
+    return info;
 }
 
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
-wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
-    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.shortName = _T("mac");
     info.name = _T("wxMac");
 #ifdef __WXUNIVERSAL__
     info.shortName << _T("univ");
     info.name << _T("/wxUniversal");
 #endif
-    return &info;
+    return info;
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)