From b02de751e92d72a9a2619dffb79f688aede31772 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 2 Jul 2009 12:40:15 +0000 Subject: [PATCH] [BUG_FIXED] Fix Window7 SetWindowsHookEx() failed issue for the dockable windows. (by recognizing windows7 environment) Signed-off-by: Don HO git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@503 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 54670350d..aa53e1986 100644 --- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h +++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h @@ -29,7 +29,7 @@ enum LangType {L_TXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\ L_CMAKE, L_YAML,\ // 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}; +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}; //#include "deprecatedSymbols.h" diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index c1d183b3e..6a760ed68 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -417,6 +417,11 @@ winVer getWindowsVersion() { case VER_PLATFORM_WIN32_NT: { + if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 ) + { + return WV_WIN7; + } + if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 ) { return WV_VISTA;