Huw Davies : riched20: Remove SendOldNotify() helper.
Alexandre Julliard
julliard at winehq.org
Tue Mar 30 15:19:50 CDT 2021
Module: wine
Branch: master
Commit: 03c2fca74ac7519f5cca8c78bd9febb459e7a101
URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c2fca74ac7519f5cca8c78bd9febb459e7a101
Author: Huw Davies <huw at codeweavers.com>
Date: Tue Mar 30 12:36:48 2021 +0100
riched20: Remove SendOldNotify() helper.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/editor.c | 9 ++-------
dlls/riched20/editor.h | 1 -
dlls/riched20/paint.c | 4 ++--
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index dccc431f041..fe05d1e7444 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -3939,7 +3939,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
editor->bHaveFocus = TRUE;
create_caret(editor);
update_caret(editor);
- ME_SendOldNotify(editor, EN_SETFOCUS);
+ ITextHost_TxNotify( editor->texthost, EN_SETFOCUS, NULL );
if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION))
ME_InvalidateSelection( editor );
return 0;
@@ -3949,7 +3949,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
editor->wheel_remain = 0;
hide_caret(editor);
DestroyCaret();
- ME_SendOldNotify(editor, EN_KILLFOCUS);
+ ITextHost_TxNotify( editor->texthost, EN_KILLFOCUS, NULL );
if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION))
ME_InvalidateSelection( editor );
return 0;
@@ -4244,11 +4244,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
return 0L;
}
-void ME_SendOldNotify(ME_TextEditor *editor, int nCode)
-{
- ITextHost_TxNotify(editor->texthost, nCode, NULL);
-}
-
/* Fill buffer with srcChars unicode characters from the start cursor.
*
* buffer: destination buffer
diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h
index fa1e22f9b48..d0274de409d 100644
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -274,7 +274,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSP
void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN;
LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
LPARAM lParam, HRESULT* phresult ) DECLSPEC_HIDDEN;
-void ME_SendOldNotify(ME_TextEditor *editor, int nCode) DECLSPEC_HIDDEN;
int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen,
const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) DECLSPEC_HIDDEN;
void ME_RTFCharAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN;
diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index 550c3c97045..f991b2bebcf 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -141,7 +141,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now)
update_caret( editor );
if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE))
- ME_SendOldNotify( editor, EN_UPDATE );
+ ITextHost_TxNotify( editor->texthost, EN_UPDATE, NULL );
ITextHost_TxViewChange(editor->texthost, update_now);
@@ -150,7 +150,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now)
if(editor->nEventMask & ENM_CHANGE)
{
editor->nEventMask &= ~ENM_CHANGE;
- ME_SendOldNotify(editor, EN_CHANGE);
+ ITextHost_TxNotify( editor->texthost, EN_CHANGE, NULL );
editor->nEventMask |= ENM_CHANGE;
}
}
More information about the wine-cvs
mailing list