summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2024-03-15 18:47:45 +0300
committerGeorge Hazan <george.hazan@gmail.com>2024-03-15 18:47:45 +0300
commit42fee4bf18089b08790194f64687158e344e56b1 (patch)
tree0b0a6eb299b8e9f748de96e91f17bbafa73695da /src/core
parent478b3261723a914310271ece3ef91abc9ce2b4cc (diff)
WM_DROPFILES / WM_PASTE processing unification
Diffstat (limited to 'src/core')
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 5b808c4ee9..b36505965a 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -588,10 +588,6 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
}
break;
- case WM_DROPFILES: // Mod from tabsrmm
- ProcessFileDrop((HDROP)wParam, m_hContact);
- return FALSE;
-
case HM_AVATARACK:
UpdateAvatar();
break;
@@ -771,10 +767,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
SetActiveWindow(m_hwnd);
break;
- case WM_DROPFILES:
- ProcessFileDrop((HDROP)wParam, m_hContact);
- return FALSE;
-
case WM_SYSCHAR:
if ((wParam == 's' || wParam == 'S') && GetKeyState(VK_MENU) & 0x8000) {
m_btnOk.Click();
@@ -809,7 +801,7 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
EnableMenuItem(mwpd.hMenu, IDM_REDO, MF_BYCOMMAND | MF_GRAYED);
if (!m_message.SendMsg(EM_CANPASTE, 0, 0)) {
- if (!IsClipboardFormatAvailable(CF_HDROP))
+ if (!IsClipboardFormatAvailable(CF_HDROP) && !IsClipboardFormatAvailable(CF_BITMAP))
EnableMenuItem(mwpd.hMenu, IDM_PASTE, MF_BYCOMMAND | MF_GRAYED);
EnableMenuItem(mwpd.hMenu, IDM_PASTESEND, MF_BYCOMMAND | MF_GRAYED);
}
@@ -879,19 +871,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
return 0;
}
- case EM_PASTESPECIAL:
- case WM_PASTE:
- if (IsClipboardFormatAvailable(CF_HDROP)) {
- if (OpenClipboard(m_message.GetHwnd())) {
- HANDLE hDrop = GetClipboardData(CF_HDROP);
- if (hDrop)
- ProcessFileDrop((HDROP)hDrop, m_hContact);
- CloseClipboard();
- }
- return 0;
- }
- break;
-
case WM_SETFOCUS:
{
const char *enc = (const char *)CallProtoService(m_szProto, PS_GETCAPS, PFLAG_GETCURRENTENCRYPTION, m_hContact);