Mercurial > jwe > octave
changeset 22733:c426d8ec521d
maint: Periodic merge of stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 07 Nov 2016 08:46:38 -0800 |
parents | 2cc35915bdc0 (current diff) 2d74b4653e5d (diff) |
children | 6f111a0f32c3 |
files | |
diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Mon Nov 07 08:06:36 2016 -0800 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Mon Nov 07 08:46:38 2016 -0800 @@ -49,6 +49,7 @@ #define _WIN32_WINNT 0x0500 #endif #include <windows.h> +#include <versionhelpers.h> #include <cstring> #include <csignal> #include <limits> @@ -383,8 +384,11 @@ l->addWidget (m_horizontalScrollBar, 1, 0); l->addWidget (m_verticalScrollBar, 0, 1); - SetConsoleCP (65001); - SetConsoleOutputCP (65001); + if (IsWindows7OrGreater ()) + { + SetConsoleCP (65001); + SetConsoleOutputCP (65001); + } // Choose 15 (0xF) as index into the Windows console color map for the // background and 0 (0x0) as the index for the foreground. This