From b2e355970100b2a2a96c4a12730a0f5713a09591 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 25 Jul 2015 19:36:18 +0000 Subject: mtextcontrol: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14702 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- bin14/mir_dev.sln | 2 +- bin14/mir_full.sln | 2 +- plugins/mTextControl/mtextcontrol.vcxproj | 33 ++++ plugins/mTextControl/mtextcontrol.vcxproj.filters | 4 + plugins/mTextControl/mtextcontrol_10.vcxproj | 217 -------------------- .../mTextControl/mtextcontrol_10.vcxproj.filters | 86 -------- plugins/mTextControl/mtextcontrol_12.vcxproj | 220 --------------------- .../mTextControl/mtextcontrol_12.vcxproj.filters | 86 -------- plugins/mTextControl/mtextcontrol_14.vcxproj | 220 --------------------- .../mTextControl/mtextcontrol_14.vcxproj.filters | 86 -------- plugins/mTextControl/src/FormattedTextDraw.cpp | 2 +- plugins/mTextControl/src/ImageDataObjectHlp.cpp | 2 +- plugins/mTextControl/src/dataobject.cpp | 2 +- plugins/mTextControl/src/enumformat.cpp | 2 +- plugins/mTextControl/src/fancy_rtf.cpp | 2 +- plugins/mTextControl/src/headers.h | 57 ------ plugins/mTextControl/src/main.cpp | 2 +- plugins/mTextControl/src/richeditutils.cpp | 2 +- plugins/mTextControl/src/services.cpp | 2 +- plugins/mTextControl/src/stdafx.cpp | 18 -- plugins/mTextControl/src/stdafx.cxx | 18 ++ plugins/mTextControl/src/stdafx.h | 57 ++++++ plugins/mTextControl/src/textcontrol.cpp | 2 +- plugins/mTextControl/src/textusers.cpp | 2 +- 29 files changed, 129 insertions(+), 1007 deletions(-) create mode 100644 plugins/mTextControl/mtextcontrol.vcxproj create mode 100644 plugins/mTextControl/mtextcontrol.vcxproj.filters delete mode 100644 plugins/mTextControl/mtextcontrol_10.vcxproj delete mode 100644 plugins/mTextControl/mtextcontrol_10.vcxproj.filters delete mode 100644 plugins/mTextControl/mtextcontrol_12.vcxproj delete mode 100644 plugins/mTextControl/mtextcontrol_12.vcxproj.filters delete mode 100644 plugins/mTextControl/mtextcontrol_14.vcxproj delete mode 100644 plugins/mTextControl/mtextcontrol_14.vcxproj.filters delete mode 100644 plugins/mTextControl/src/headers.h delete mode 100644 plugins/mTextControl/src/stdafx.cpp create mode 100644 plugins/mTextControl/src/stdafx.cxx create mode 100644 plugins/mTextControl/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 405e558150..7de4410c76 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_10.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plugins\NewXstatusNotify\NewXstatusNotify_10.vcxproj", "{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 5bd57075cc..8e2fcdca05 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_10.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plugins\NewXstatusNotify\NewXstatusNotify_10.vcxproj", "{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 8897350126..66527f7673 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_10.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plugins\NewXstatusNotify\NewXstatusNotify_10.vcxproj", "{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index b96c050f16..205f02d727 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -82,7 +82,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_12.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plugins\NewXstatusNotify\NewXstatusNotify_12.vcxproj", "{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index d162b310b3..f2d86f251a 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -82,7 +82,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_12.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plugins\NewXstatusNotify\NewXstatusNotify_12.vcxproj", "{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}" EndProject diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index dd8e770f1b..adf50bf13a 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -82,7 +82,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_14.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plugins\NewXstatusNotify\NewXstatusNotify_14.vcxproj", "{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}" EndProject diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index bd32a4d621..2cd458873a 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -82,7 +82,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_14.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plugins\NewXstatusNotify\NewXstatusNotify_14.vcxproj", "{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}" EndProject diff --git a/plugins/mTextControl/mtextcontrol.vcxproj b/plugins/mTextControl/mtextcontrol.vcxproj new file mode 100644 index 0000000000..42d4b86b2b --- /dev/null +++ b/plugins/mTextControl/mtextcontrol.vcxproj @@ -0,0 +1,33 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + mTextControl + {E26D2311-C164-48CF-BA24-5CEDA873D1B2} + + + + + + + MTEXT_NOHELPERS;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/plugins/mTextControl/mtextcontrol.vcxproj.filters b/plugins/mTextControl/mtextcontrol.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/mTextControl/mtextcontrol.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/mTextControl/mtextcontrol_10.vcxproj b/plugins/mTextControl/mtextcontrol_10.vcxproj deleted file mode 100644 index 67ded48b21..0000000000 --- a/plugins/mTextControl/mtextcontrol_10.vcxproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - mTextControl - {E26D2311-C164-48CF-BA24-5CEDA873D1B2} - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - headers.h - Level3 - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x25a20000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - Full - OnlyExplicitInline - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - true - Use - headers.h - Level3 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - 0x25a20000 - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - headers.h - Level3 - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x25a20000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - Full - OnlyExplicitInline - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - true - Use - headers.h - Level3 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - 0x25a20000 - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/mTextControl/mtextcontrol_10.vcxproj.filters b/plugins/mTextControl/mtextcontrol_10.vcxproj.filters deleted file mode 100644 index 025321cd55..0000000000 --- a/plugins/mTextControl/mtextcontrol_10.vcxproj.filters +++ /dev/null @@ -1,86 +0,0 @@ - - - - - {2ba6b395-db86-4c21-bd99-960dd8ae399a} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {638b774c-2eb7-43db-a58a-f1eb0659fee9} - h;hpp;hxx;hm;inl - - - {cc11ab2b-a14e-4f67-8b7a-72d64c4aa033} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/mTextControl/mtextcontrol_12.vcxproj b/plugins/mTextControl/mtextcontrol_12.vcxproj deleted file mode 100644 index 0b0e175120..0000000000 --- a/plugins/mTextControl/mtextcontrol_12.vcxproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - mTextControl - {E26D2311-C164-48CF-BA24-5CEDA873D1B2} - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - headers.h - Level4 - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x25a20000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - false - - - - - Full - OnlyExplicitInline - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - true - Use - headers.h - Level4 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - 0x25a20000 - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - headers.h - Level4 - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x25a20000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Full - OnlyExplicitInline - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - true - Use - headers.h - Level4 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - 0x25a20000 - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin12\lib - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/mTextControl/mtextcontrol_12.vcxproj.filters b/plugins/mTextControl/mtextcontrol_12.vcxproj.filters deleted file mode 100644 index 025321cd55..0000000000 --- a/plugins/mTextControl/mtextcontrol_12.vcxproj.filters +++ /dev/null @@ -1,86 +0,0 @@ - - - - - {2ba6b395-db86-4c21-bd99-960dd8ae399a} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {638b774c-2eb7-43db-a58a-f1eb0659fee9} - h;hpp;hxx;hm;inl - - - {cc11ab2b-a14e-4f67-8b7a-72d64c4aa033} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/mTextControl/mtextcontrol_14.vcxproj b/plugins/mTextControl/mtextcontrol_14.vcxproj deleted file mode 100644 index eb43b03e30..0000000000 --- a/plugins/mTextControl/mtextcontrol_14.vcxproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - mTextControl - {E26D2311-C164-48CF-BA24-5CEDA873D1B2} - - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - headers.h - Level4 - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x25a20000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - false - - - - - Full - OnlyExplicitInline - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - true - Use - headers.h - Level4 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - 0x25a20000 - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin14\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - headers.h - Level4 - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x25a20000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - - - - - Full - OnlyExplicitInline - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - true - true - Use - headers.h - Level4 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - 0x25a20000 - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin14\lib - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/mTextControl/mtextcontrol_14.vcxproj.filters b/plugins/mTextControl/mtextcontrol_14.vcxproj.filters deleted file mode 100644 index 025321cd55..0000000000 --- a/plugins/mTextControl/mtextcontrol_14.vcxproj.filters +++ /dev/null @@ -1,86 +0,0 @@ - - - - - {2ba6b395-db86-4c21-bd99-960dd8ae399a} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {638b774c-2eb7-43db-a58a-f1eb0659fee9} - h;hpp;hxx;hm;inl - - - {cc11ab2b-a14e-4f67-8b7a-72d64c4aa033} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/mTextControl/src/FormattedTextDraw.cpp b/plugins/mTextControl/src/FormattedTextDraw.cpp index ed6616f903..8e3afd3103 100644 --- a/plugins/mTextControl/src/FormattedTextDraw.cpp +++ b/plugins/mTextControl/src/FormattedTextDraw.cpp @@ -4,7 +4,7 @@ // FormattedTextDraw.cpp : Implementation of CFormattedTextDraw -#include "headers.h" +#include "stdafx.h" const IID IID_ITextServices = { // 8d33f740-cf58-11ce-a89d-00aa006cadc5 diff --git a/plugins/mTextControl/src/ImageDataObjectHlp.cpp b/plugins/mTextControl/src/ImageDataObjectHlp.cpp index 423e92c0a2..b176c20a6e 100644 --- a/plugins/mTextControl/src/ImageDataObjectHlp.cpp +++ b/plugins/mTextControl/src/ImageDataObjectHlp.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //imagedataobject //code taken partly from public example on the internet, source unknown. -#include "headers.h" +#include "stdafx.h" struct EMFCACHE { diff --git a/plugins/mTextControl/src/dataobject.cpp b/plugins/mTextControl/src/dataobject.cpp index b8a7212382..53fcd0e2f7 100644 --- a/plugins/mTextControl/src/dataobject.cpp +++ b/plugins/mTextControl/src/dataobject.cpp @@ -10,7 +10,7 @@ //#define STRICT -#include "headers.h" +#include "stdafx.h" const ULONG MAX_FORMATS = 100; diff --git a/plugins/mTextControl/src/enumformat.cpp b/plugins/mTextControl/src/enumformat.cpp index 917fe0c584..27aceb5790 100644 --- a/plugins/mTextControl/src/enumformat.cpp +++ b/plugins/mTextControl/src/enumformat.cpp @@ -16,7 +16,7 @@ //#define STRICT -#include "headers.h" +#include "stdafx.h" class CEnumFormatEtc : public IEnumFORMATETC { diff --git a/plugins/mTextControl/src/fancy_rtf.cpp b/plugins/mTextControl/src/fancy_rtf.cpp index da5f8971c9..faaef95c72 100644 --- a/plugins/mTextControl/src/fancy_rtf.cpp +++ b/plugins/mTextControl/src/fancy_rtf.cpp @@ -1,4 +1,4 @@ -#include "headers.h" +#include "stdafx.h" struct BBCodeInfo { diff --git a/plugins/mTextControl/src/headers.h b/plugins/mTextControl/src/headers.h deleted file mode 100644 index e46827e586..0000000000 --- a/plugins/mTextControl/src/headers.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -Miranda Text Control - Plugin for Miranda IM -Copyright (C) 2005 Victor Pavlychko (nullbie@gmail.com) - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef __headers_h__ -#define __headers_h__ - -#define _CRT_SECURE_NO_DEPRECATE - -#define OEMRESOURCE - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include "version.h" -#include "services.h" -#include "textusers.h" -#include "richeditutils.h" -#include "ImageDataObjectHlp.h" -#include "FormattedTextDraw.h" -#include "fancy_rtf.h" -#include "textcontrol.h" - -#define MODULNAME "MTextControl" //DB modul for this plugin -#define MODULTITLE "Text Display" - -// globals -extern HINSTANCE hInst; -extern PLUGININFOEX pluginInfoEx; - -#endif // __headers_h__ diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp index 27849f53d0..96c9d4865f 100644 --- a/plugins/mTextControl/src/main.cpp +++ b/plugins/mTextControl/src/main.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "headers.h" +#include "stdafx.h" HINSTANCE hInst = 0; int hLangpack; diff --git a/plugins/mTextControl/src/richeditutils.cpp b/plugins/mTextControl/src/richeditutils.cpp index cf859202a5..0107d2d92f 100644 --- a/plugins/mTextControl/src/richeditutils.cpp +++ b/plugins/mTextControl/src/richeditutils.cpp @@ -1,4 +1,4 @@ -#include "headers.h" +#include "stdafx.h" class CREOleCallback : public IRichEditOleCallback { diff --git a/plugins/mTextControl/src/services.cpp b/plugins/mTextControl/src/services.cpp index 1ccdfa2401..ed6ff03f3e 100644 --- a/plugins/mTextControl/src/services.cpp +++ b/plugins/mTextControl/src/services.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" static HANDLE hService[11] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; diff --git a/plugins/mTextControl/src/stdafx.cpp b/plugins/mTextControl/src/stdafx.cpp deleted file mode 100644 index 7e0216078c..0000000000 --- a/plugins/mTextControl/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "headers.h" \ No newline at end of file diff --git a/plugins/mTextControl/src/stdafx.cxx b/plugins/mTextControl/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/mTextControl/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/mTextControl/src/stdafx.h b/plugins/mTextControl/src/stdafx.h new file mode 100644 index 0000000000..e46827e586 --- /dev/null +++ b/plugins/mTextControl/src/stdafx.h @@ -0,0 +1,57 @@ +/* +Miranda Text Control - Plugin for Miranda IM +Copyright (C) 2005 Victor Pavlychko (nullbie@gmail.com) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef __headers_h__ +#define __headers_h__ + +#define _CRT_SECURE_NO_DEPRECATE + +#define OEMRESOURCE + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include "version.h" +#include "services.h" +#include "textusers.h" +#include "richeditutils.h" +#include "ImageDataObjectHlp.h" +#include "FormattedTextDraw.h" +#include "fancy_rtf.h" +#include "textcontrol.h" + +#define MODULNAME "MTextControl" //DB modul for this plugin +#define MODULTITLE "Text Display" + +// globals +extern HINSTANCE hInst; +extern PLUGININFOEX pluginInfoEx; + +#endif // __headers_h__ diff --git a/plugins/mTextControl/src/textcontrol.cpp b/plugins/mTextControl/src/textcontrol.cpp index f2c0514134..e8d25fffea 100644 --- a/plugins/mTextControl/src/textcontrol.cpp +++ b/plugins/mTextControl/src/textcontrol.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" LRESULT CALLBACK MTextControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT MTextControl_OnPaint(HWND hwnd, WPARAM wParam, LPARAM lParam); diff --git a/plugins/mTextControl/src/textusers.cpp b/plugins/mTextControl/src/textusers.cpp index a5a5e89897..867c5e1243 100644 --- a/plugins/mTextControl/src/textusers.cpp +++ b/plugins/mTextControl/src/textusers.cpp @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "headers.h" +#include "stdafx.h" HANDLE htuDefault = 0; -- cgit v1.2.3