diff --git a/include/wx/utils.h b/include/wx/utils.h index e29c131697..5581eadb3d 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -140,8 +140,8 @@ WXDLLIMPEXP_CORE wxVersionInfo wxGetLibraryVersionInfo(); WXDLLIMPEXP_BASE wxString wxGetOsDescription(); // Get OS version -WXDLLIMPEXP_BASE wxOperatingSystemId wxGetOsVersion(int *majorVsn = NULL, - int *minorVsn = NULL); +WXDLLIMPEXP_BASE wxOperatingSystemId wxGetOsVersion(int *verMaj = NULL, + int *verMin = NULL); // Check is OS version is at least the specified major and minor version WXDLLIMPEXP_BASE bool wxCheckOsVersion(int majorVsn, int minorVsn = 0); diff --git a/src/osx/cocoa/utils_base.mm b/src/osx/cocoa/utils_base.mm index d59ef76416..bd96e3945a 100644 --- a/src/osx/cocoa/utils_base.mm +++ b/src/osx/cocoa/utils_base.mm @@ -28,18 +28,18 @@ #endif // our OS version is the same in non GUI and GUI cases -wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn) +wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) { #ifdef wxHAS_NSPROCESSINFO if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) { NSOperatingSystemVersion osVer = [NSProcessInfo processInfo].operatingSystemVersion; - if ( majorVsn != NULL ) - *majorVsn = osVer.majorVersion; + if ( verMaj != NULL ) + *verMaj = osVer.majorVersion; - if ( minorVsn != NULL ) - *minorVsn = osVer.minorVersion; + if ( verMin != NULL ) + *verMin = osVer.minorVersion; } else #endif @@ -57,11 +57,11 @@ wxGCC_WARNING_SUPPRESS(deprecated-declarations) #endif wxGCC_WARNING_RESTORE() - if ( majorVsn != NULL ) - *majorVsn = maj; + if ( verMaj != NULL ) + *verMaj = maj; - if ( minorVsn != NULL ) - *minorVsn = min; + if ( verMin != NULL ) + *verMin = min; } return wxOS_MAC_OSX_DARWIN;