From 84fbc12f2d8d15fb646b0d8034cf4d3c6d0f61bc Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Fri, 26 Feb 2016 16:11:17 +0100 Subject: [PATCH] Return Windows build number as micro version in wxGetOsVersion(). --- src/msw/utils.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 685ae3a5c2..0210afbc86 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -1244,7 +1244,8 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro) wxOperatingSystemId os; int verMaj, - verMin; + verMin, + verMicro; } s_version; // query the OS info only once as it's not supposed to change @@ -1267,6 +1268,7 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro) s_version.verMaj = info.dwMajorVersion; s_version.verMin = info.dwMinorVersion; + s_version.verMicro = info.dwBuildNumber; } if ( verMaj ) @@ -1274,7 +1276,7 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro) if ( verMin ) *verMin = s_version.verMin; if ( verMicro ) - *verMicro = 0; + *verMicro = s_version.verMicro; return s_version.os; }