From 13d6419ad0a343800dce4a334f91ed20dfb8e280 Mon Sep 17 00:00:00 2001 From: Catalin Date: Sun, 21 Feb 2016 10:41:38 +0200 Subject: [PATCH] Changed obsolete OS names to Unknown, but keep the array entries to avoid breaking indexes. --- src/common/platinfo.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/common/platinfo.cpp b/src/common/platinfo.cpp index 41fd0c23db..e091ee44bd 100644 --- a/src/common/platinfo.cpp +++ b/src/common/platinfo.cpp @@ -42,15 +42,17 @@ static wxPlatformInfo gs_platInfo(wxPORT_UNKNOWN); // constants // ---------------------------------------------------------------------------- +// Keep "Unknown" entries to avoid breaking the indexes + static const wxChar* const wxOperatingSystemIdNames[] = { wxT("Apple Mac OS"), wxT("Apple Mac OS X"), - wxT("Microsoft Windows 9X"), + wxT("Unknown"), // STL build: cannot use _() to translate strings here wxT("Microsoft Windows NT"), - wxT("Microsoft Windows Micro"), - wxT("Microsoft Windows CE"), + wxT("Unknown"), + wxT("Unknown"), wxT("Linux"), wxT("FreeBSD"), @@ -64,8 +66,8 @@ static const wxChar* const wxOperatingSystemIdNames[] = wxT("Other Unix"), wxT("Other Unix"), - wxT("DOS"), - wxT("OS/2"), + wxT("Unknown"), + wxT("Unknown"), }; @@ -77,10 +79,10 @@ static const wxChar* const wxPortIdNames[] = wxT("wxGTK"), wxT("wxDFB"), wxT("wxX11"), - wxT("wxOS2"), + wxT("Unknown"), wxT("wxMac"), wxT("wxCocoa"), - wxT("wxWinCE"), + wxT("Unknown"), wxT("wxQT") }; @@ -365,4 +367,3 @@ wxEndianness wxPlatformInfo::GetEndianness(const wxString& end) return wxENDIAN_INVALID; } -