Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name the parameters of wxGetOsVersion consistently

Browse Source 
Use verMaj and verMin like almost everywhere instead of majorVsn and
minorVsn in a couple of places.
This commit is contained in:
Dimitri Schoolwerth
2015-06-24 04:49:14 +04:00
committed by Tobias Taschner
parent cbb799b1ae
commit 5983274af6
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/utils.h
View File

@@ -140,8 +140,8 @@ WXDLLIMPEXP_CORE wxVersionInfo wxGetLibraryVersionInfo();
WXDLLIMPEXP_BASE wxString wxGetOsDescription(); WXDLLIMPEXP_BASE wxString wxGetOsDescription();
// Get OS version // Get OS version
WXDLLIMPEXP_BASE wxOperatingSystemId wxGetOsVersion(int *majorVsn = NULL, WXDLLIMPEXP_BASE wxOperatingSystemId wxGetOsVersion(int *verMaj = NULL,
int *minorVsn = NULL); int *verMin = NULL);
// Check is OS version is at least the specified major and minor version // Check is OS version is at least the specified major and minor version
WXDLLIMPEXP_BASE bool wxCheckOsVersion(int majorVsn, int minorVsn = 0); WXDLLIMPEXP_BASE bool wxCheckOsVersion(int majorVsn, int minorVsn = 0);

18
src/osx/cocoa/utils_base.mm
View File

@@ -28,18 +28,18 @@
#endif #endif
// our OS version is the same in non GUI and GUI cases // 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 #ifdef wxHAS_NSPROCESSINFO
if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)])
{ {
NSOperatingSystemVersion osVer = [NSProcessInfo processInfo].operatingSystemVersion; NSOperatingSystemVersion osVer = [NSProcessInfo processInfo].operatingSystemVersion;
if ( majorVsn != NULL ) if ( verMaj != NULL )
*majorVsn = osVer.majorVersion; *verMaj = osVer.majorVersion;
if ( minorVsn != NULL ) if ( verMin != NULL )
*minorVsn = osVer.minorVersion; *verMin = osVer.minorVersion;
} }
else else
#endif #endif
@@ -57,11 +57,11 @@ wxGCC_WARNING_SUPPRESS(deprecated-declarations)
#endif #endif
wxGCC_WARNING_RESTORE() wxGCC_WARNING_RESTORE()
if ( majorVsn != NULL ) if ( verMaj != NULL )
*majorVsn = maj; *verMaj = maj;
if ( minorVsn != NULL ) if ( verMin != NULL )
*minorVsn = min; *verMin = min;
} }
return wxOS_MAC_OSX_DARWIN; return wxOS_MAC_OSX_DARWIN;