diff --git a/SlxCom/DesktopIconManager.cpp b/SlxCom/DesktopIconManager.cpp index 72f23b5..ef0116d 100644 --- a/SlxCom/DesktopIconManager.cpp +++ b/SlxCom/DesktopIconManager.cpp @@ -4,6 +4,10 @@ #include #include "SlxComTools.h" +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL 0x020E +#endif + using namespace std; class CMButtonUpListener diff --git a/SlxCom/SlxCom.cpp b/SlxCom/SlxCom.cpp index 64d78d1..d71f4d6 100644 --- a/SlxCom/SlxCom.cpp +++ b/SlxCom/SlxCom.cpp @@ -8,6 +8,10 @@ #include "SlxComTools.h" #include +#ifndef LVS_EX_SNAPTOGRID +#define LVS_EX_SNAPTOGRID 0x00080000 // Icons automatically snap to grid. +#endif + #pragma comment(lib, "RpcRt4.lib") #pragma comment(lib, "Shlwapi.lib") #pragma comment(lib, "Version.lib") diff --git a/SlxCom/SlxCom.vcproj b/SlxCom/SlxCom.vcproj index 77da7b8..a388870 100644 --- a/SlxCom/SlxCom.vcproj +++ b/SlxCom/SlxCom.vcproj @@ -44,7 +44,7 @@ - + Debug @@ -22,29 +22,30 @@ {337A517D-3224-4DD6-A5AA-FCDA309283BC} SlxCom Win32Proj + 8.1 DynamicLibrary Unicode true - v120 + v140_xp DynamicLibrary Unicode - v120 + v140_xp DynamicLibrary Unicode true - v120 + v140_xp DynamicLibrary Unicode - v120 + v140_xp @@ -94,7 +95,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 + WIN32;_WIN32_WINNT=0x500;_DEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 true EnableFastChecks MultiThreadedDebugDLL @@ -127,7 +128,7 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 + WIN32;_WIN32_WINNT=0x500;_DEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 true EnableFastChecks MultiThreadedDebugDLL @@ -158,7 +159,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 + WIN32;_WIN32_WINNT=0x500;NDEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 MultiThreaded true false @@ -193,7 +194,7 @@ MaxSpeed true - WIN32;NDEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 + WIN32;_WIN32_WINNT=0x500;NDEBUG;_WINDOWS;_USRDLL;SLXCOM_EXPORTS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions);_WIN32_WINNT=0x500;WINVER=0x500 MultiThreaded true false @@ -224,12 +225,18 @@ + + + + + + @@ -238,10 +245,14 @@ + + + + @@ -288,10 +299,19 @@ + + + + + + + + + @@ -300,9 +320,13 @@ + + + + diff --git a/SlxCom/SlxCom.vcxproj.filters b/SlxCom/SlxCom.vcxproj.filters index 6ca3c26..63a5bae 100644 --- a/SlxCom/SlxCom.vcxproj.filters +++ b/SlxCom/SlxCom.vcxproj.filters @@ -18,18 +18,54 @@ - + + lib + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + + 源文件 + + 源文件 源文件 + + 源文件 + 源文件 + + 源文件 + 源文件 + + 源文件 + 源文件 @@ -45,47 +81,41 @@ 源文件 - + 源文件 - + 源文件 - + 源文件 - + 源文件 - + 源文件 - - lib - - + 源文件 源文件 - - 源文件 - - + 源文件 - + 源文件 - + 源文件 - - 源文件 + + lib - - 源文件 + + lib @@ -196,63 +226,102 @@ 头文件 - + + lib + + + lib + + 头文件 - + 头文件 - + 头文件 - + 头文件 - + 头文件 - + 头文件 - + 头文件 - + 头文件 - + 头文件 - + 头文件 - + 头文件 - - lib + + 头文件 - - lib + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 + + + 头文件 头文件 - + 头文件 头文件 - + 头文件 - + 头文件 - + + 头文件 + + 头文件 + + lib + + + lib + + + lib + + + lib + diff --git a/SlxCom14.sln b/SlxCom14.sln new file mode 100644 index 0000000..bcb5e68 --- /dev/null +++ b/SlxCom14.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SlxCom", "SlxCom\SlxCom.vcxproj", "{337A517D-3224-4DD6-A5AA-FCDA309283BC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Debug|Win32.Build.0 = Debug|Win32 + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Debug|x64.ActiveCfg = Debug|x64 + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Debug|x64.Build.0 = Debug|x64 + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Release|Win32.ActiveCfg = Release|Win32 + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Release|Win32.Build.0 = Release|Win32 + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Release|x64.ActiveCfg = Release|x64 + {337A517D-3224-4DD6-A5AA-FCDA309283BC}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/SlxCom6.dsw b/SlxCom6.dsw deleted file mode 100644 index d5cf575..0000000 --- a/SlxCom6.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "SlxCom"=".\SlxCom\SlxCom.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### -