RichEd20.dll replaced with Msftedit.dll

git-svn-id: http://svn.miranda-ng.org/main/trunk@11011 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 9 insertions, 9 deletions

diff --git a/src/core/stdchat/res/chat.rc b/src/core/stdchat/res/chat.rc
index 469fe8dc7e..1465655e61 100644
--- a/src/core/stdchat/res/chat.rc
+++ b/src/core/stdchat/res/chat.rc
@@ -33,7 +33,7 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX |
 	WS_THICKFRAME

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "",IDC_MESSAGE,RICHEDIT_CLASS,ES_MULTILINE | 

+    CONTROL         "",IDC_MESSAGE,"RichEdit50W",ES_MULTILINE | 

 					ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | 

 					ES_NUMBER | WS_VSCROLL | WS_TABSTOP,0,128,127,12,

 					WS_EX_STATICEDGE

@@ -48,7 +48,7 @@ BEGIN
     CONTROL         "&Filter",IDC_FILTER,"MButtonClass",WS_TABSTOP,220,108,15,13,0x18000000L

     CONTROL         "&Room settings",IDC_CHANMGR,"MButtonClass",WS_DISABLED | WS_TABSTOP,204,108,15,13,0x18000000L

     CONTROL         "&Show/Hide nick list",IDC_SHOWNICKLIST,"MButtonClass",WS_TABSTOP,236,108,15,13,0x18000000L

-    CONTROL         "",IDC_LOG,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | 

+    CONTROL         "",IDC_LOG,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | 

                     ES_READONLY | ES_NUMBER | WS_VSCROLL | WS_TABSTOP,8,23,

                     164,73,WS_EX_STATICEDGE

     CONTROL         "",IDC_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73

diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc
index 13d84479cf..c8de828cc9 100644
--- a/src/core/stdmsg/res/resource.rc
+++ b/src/core/stdmsg/res/resource.rc
@@ -74,7 +74,7 @@ BEGIN
     LTEXT           "An error has occurred. The protocol reported the following error:",IDC_STATIC,5,4,177,20

     EDITTEXT        IDC_ERRORTEXT,5,24,177,21,ES_MULTILINE | ES_READONLY

     LTEXT           "while sending the following message:",IDC_STATIC,6,48,175,8

-    CONTROL         "",IDC_MSGTEXT,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,5,60,177,26,WS_EX_STATICEDGE

+    CONTROL         "",IDC_MSGTEXT,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,5,60,177,26,WS_EX_STATICEDGE

     DEFPUSHBUTTON   "Try again",IDOK,22,91,63,14

     PUSHBUTTON      "Cancel",IDCANCEL,104,91,61,14

 END

@@ -91,10 +91,10 @@ BEGIN
     CONTROL         "&User menu",IDC_USERMENU,"MButtonClass",WS_TABSTOP,128,2,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Details",IDC_DETAILS,"MButtonClass",WS_TABSTOP,146,2,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&History",IDC_HISTORY,"MButtonClass",WS_TABSTOP,164,2,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "",IDC_MESSAGE,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_TABSTOP,1,49,141,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE

+    CONTROL         "",IDC_MESSAGE,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_TABSTOP,1,49,141,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE

     DEFPUSHBUTTON   "&Send",IDOK,143,48,39,15

     PUSHBUTTON      "Close",IDCANCEL,129,0,54,15,NOT WS_VISIBLE

-    CONTROL         "",IDC_LOG,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,1,18,183,26,WS_EX_STATICEDGE

+    CONTROL         "",IDC_LOG,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,1,18,183,26,WS_EX_STATICEDGE

     CONTROL         "",IDC_SPLITTER,"Static",SS_ENHMETAFILE,0,45,183,2

     CONTROL         "",IDC_AVATAR,"Button",BS_OWNERDRAW | NOT WS_VISIBLE,1,50,1,13

 END

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index ac00e00bac..3b9a1e2184 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -378,11 +378,11 @@ static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static TCHAR tszError[] = LPGENT("Miranda could not load the built-in message module, riched20.dll is missing. Press 'Yes' to continue loading Miranda.");

+static TCHAR tszError[] = LPGENT("Miranda could not load the built-in message module, Msftedit.dll is missing. Press 'Yes' to continue loading Miranda.");

 

 int LoadSendRecvMessageModule(void)

 {

-	if (LoadLibraryA("riched20.dll") == NULL) {

+	if (LoadLibraryA("Msftedit.dll") == NULL) {

 		if (IDYES != MessageBox(0, TranslateTS(tszError), TranslateT("Information"), MB_YESNO | MB_ICONINFORMATION))

 			return 1;

 		return 0;

@@ -444,7 +444,7 @@ int SplitmsgShutdown(void)
 	DestroyHookableEvent(hHookWinWrite);

 

 	FreeMsgLogIcons();

-	FreeLibrary(GetModuleHandleA("riched20"));

+	FreeLibrary(GetModuleHandleA("Msftedit"));

 	OleUninitialize();

 	RichUtil_Unload();

 	msgQueue_destroy();

diff --git a/src/resource.rc b/src/resource.rc
index 4b20f3b4d0..32aeba4aeb 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -730,7 +730,7 @@ BEGIN
     EDITTEXT        IDC_TXT_MULTILINE,6,6,230,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | WS_VSCROLL

     EDITTEXT        IDC_TXT_PASSWORD,6,6,230,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE

     COMBOBOX        IDC_TXT_COMBO,6,6,230,92,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "",IDC_TXT_RICHEDIT,"RichEdit20W",NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12

+    CONTROL         "",IDC_TXT_RICHEDIT,"RichEdit50W",NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12

     DEFPUSHBUTTON   "OK",IDOK,131,23,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,186,23,50,14

 END