diff options
| author | Goraf <goraf@miranda-ng.org> | 2016-02-06 18:09:52 +0000 |
|---|---|---|
| committer | Goraf <goraf@miranda-ng.org> | 2016-02-06 18:09:52 +0000 |
| commit | edf2ac2358c5551f17bfe9e7a58c2ae23b0a1a3f (patch) | |
| tree | fb9d6412443c93e4aded76f41efc26597e9f99b9 /plugins | |
| parent | 2815bf4db9f637c7b82e9e484510f8a19b0203db (diff) | |
ContextHelp: richedit20.dll -> msftedit
git-svn-id: http://svn.miranda-ng.org/main/trunk@16228 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ContextHelp/src/helpdlg.cpp | 2 | ||||
| -rw-r--r-- | plugins/ContextHelp/src/main.cpp | 6 | ||||
| -rw-r--r-- | plugins/ContextHelp/src/stdafx.h | 1 | ||||
| -rw-r--r-- | plugins/ContextHelp/src/streaminout.cpp | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/plugins/ContextHelp/src/helpdlg.cpp b/plugins/ContextHelp/src/helpdlg.cpp index 7a6dee18f4..38d2b5d058 100644 --- a/plugins/ContextHelp/src/helpdlg.cpp +++ b/plugins/ContextHelp/src/helpdlg.cpp @@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-#include <richedit.h>
-
extern HINSTANCE hInst;
HWND hwndHelpDlg;
diff --git a/plugins/ContextHelp/src/main.cpp b/plugins/ContextHelp/src/main.cpp index ed2ba99d7f..b72edee83f 100644 --- a/plugins/ContextHelp/src/main.cpp +++ b/plugins/ContextHelp/src/main.cpp @@ -94,10 +94,10 @@ extern "C" __declspec(dllexport) int Load(void) if (!InitCommonControlsEx(&icc))
return 1;
- if (LoadLibrary(_T("riched20.dll")) == NULL) /* richedit v2.0 (Win98/NT4), v3.0 (WinXP/2000/Me+) */
+ if (LoadLibrary(_T("Msftedit.dll")) == NULL)
if (IDYES != MessageBoxEx(NULL,
- TranslateT("The Help Plugin can not be loaded, riched20.dll is missing. If you are using WINE please make sure you have riched20.dll installed.\n\nPress 'Yes' to continue loading Miranda NG."),
- TranslateT("Help plugin"), MB_YESNO | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST | MB_TASKMODAL, LANGIDFROMLCID(Langpack_GetDefaultLocale())))
+ TranslateT("The Context help plugin can not be loaded, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda."),
+ TranslateT("Context help plugin"), MB_YESNO | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST | MB_TASKMODAL, LANGIDFROMLCID(Langpack_GetDefaultLocale())))
return 1;
if (InstallDialogBoxHook())
diff --git a/plugins/ContextHelp/src/stdafx.h b/plugins/ContextHelp/src/stdafx.h index 20cac3503d..98cea224c5 100644 --- a/plugins/ContextHelp/src/stdafx.h +++ b/plugins/ContextHelp/src/stdafx.h @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <windows.h>
#include <Uxtheme.h>
#include <Vsstyle.h>
+#include <richedit.h>
#include <newpluginapi.h>
//#include <win2k.h>
diff --git a/plugins/ContextHelp/src/streaminout.cpp b/plugins/ContextHelp/src/streaminout.cpp index 460bc655c2..4d390c3d0a 100644 --- a/plugins/ContextHelp/src/streaminout.cpp +++ b/plugins/ContextHelp/src/streaminout.cpp @@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-#include <richedit.h>
-
struct EditStreamData {
PBYTE pbBuff;
int cbBuff;
|