From af994f00429a3e310db010b22a20ec52eadfba81 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 1 Jul 2012 15:38:30 +0000 Subject: [PATCH] [BUG_FIXED] Add Windows 8 detection - Fix the sidebar splitter failed in Windows 8 issue. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@924 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h | 2 +- PowerEditor/src/Parameters.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h index f74cd35d..0737868c 100644 --- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h +++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h @@ -39,7 +39,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\ L_CMAKE, L_YAML, L_COBOL, L_GUI4CLI, L_D, L_POWERSHELL, L_R, L_JSP,\ // The end of enumated language type, so it should be always at the end L_EXTERNAL}; -enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7}; +enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8}; //#include "deprecatedSymbols.h" diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 168f574e..f086b0b0 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -551,6 +551,11 @@ winVer getWindowsVersion() { case VER_PLATFORM_WIN32_NT: { + if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2 ) + { + return WV_WIN8; + } + if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 ) { return WV_WIN7;