Merge branch 'os_version'

Make strings returned by wxGetOsDescription() more readable for the users.
2015-09-06 14:24:57 +02:00
parent fe9a5f47f4 8b2dc19dbb
commit 4d911fb059
5 changed files with 43 additions and 8 deletions
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1226,7 +1226,7 @@ wxString wxGetOsDescription()

                case 10:
                    str = wxIsWindowsServer() == 1
-                            ? _("Windows Server 10")
+                            ? _("Windows Server 2016")
                            : _("Windows 10");
                    break;
            }