Don't duplicate wxGetOsVersion() in wxMSW wxGUIAppTraits.
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:
@@ -262,19 +262,9 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags)
|
||||
|
||||
wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
|
||||
{
|
||||
OSVERSIONINFO info;
|
||||
wxZeroMemory(info);
|
||||
|
||||
// on Windows, the toolkit version is the same of the OS version
|
||||
// as Windows integrates the OS kernel with the GUI toolkit.
|
||||
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
|
||||
if ( ::GetVersionEx(&info) )
|
||||
{
|
||||
if ( majVer )
|
||||
*majVer = info.dwMajorVersion;
|
||||
if ( minVer )
|
||||
*minVer = info.dwMinorVersion;
|
||||
}
|
||||
wxGetOsVersion(majVer, minVer);
|
||||
|
||||
#if defined(__WXHANDHELD__) || defined(__WXWINCE__)
|
||||
return wxPORT_WINCE;
|
||||
|
||||
Reference in New Issue
Block a user