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

Don't duplicate wxGetOsVersion() in wxMSW wxGUIAppTraits.

Browse Source 
Just call wxGetOsVersion() instead of using the Windows ::GetVersionEx()
function directly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-04-27 22:39:34 +00:00
parent 86c286354f
commit 2964de72a5
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/app.cpp
View File

@@ -262,19 +262,9 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags)
wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
{ {
OSVERSIONINFO info;
wxZeroMemory(info);
// on Windows, the toolkit version is the same of the OS version // on Windows, the toolkit version is the same of the OS version
// as Windows integrates the OS kernel with the GUI toolkit. // as Windows integrates the OS kernel with the GUI toolkit.
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); wxGetOsVersion(majVer, minVer);
if ( ::GetVersionEx(&info) )
{
if ( majVer )
*majVer = info.dwMajorVersion;
if ( minVer )
*minVer = info.dwMinorVersion;
}
#if defined(__WXHANDHELD__) || defined(__WXWINCE__) #if defined(__WXHANDHELD__) || defined(__WXWINCE__)
return wxPORT_WINCE; return wxPORT_WINCE;