Fix wxGetOsDescription() for Windows 10.
Check for Windows 10 was implemented as check for version 6.4 but the final version of Windows 10 actually returns 10.0.
This commit is contained in:
parent
e97bd98e18
commit
c87c432033
@ -164,6 +164,7 @@ wxMSW:
|
||||
- Don't send bogus root selection events when clicking wxTreeCtrl (sbrowne).
|
||||
- Avoid bogus assert after calling wxDatePickerCtrl::SetRange().
|
||||
- Add solution file for building with MSVS 2014 (Peter Tissen).
|
||||
- Correct wxGetOsDescription() for Windows 10 (Tobias Taschner).
|
||||
|
||||
wxOSX/Cocoa:
|
||||
|
||||
|
@ -1224,14 +1224,14 @@ wxString wxGetOsDescription()
|
||||
? _("Windows Server 2012 R2")
|
||||
: _("Windows 8.1");
|
||||
break;
|
||||
|
||||
case 4:
|
||||
str = wxIsWindowsServer() == 1
|
||||
? _("Windows Server 10")
|
||||
: _("Windows 10");
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 10:
|
||||
str = wxIsWindowsServer() == 1
|
||||
? _("Windows Server 10")
|
||||
: _("Windows 10");
|
||||
break;
|
||||
}
|
||||
|
||||
if ( str.empty() )
|
||||
|
Loading…
Reference in New Issue
Block a user