diff options
| -rw-r--r-- | plugins/Scriver/src/Version.h | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/commonheaders.h | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 14 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgs.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgs.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/version.h | 2 |
7 files changed, 10 insertions, 16 deletions
diff --git a/plugins/Scriver/src/Version.h b/plugins/Scriver/src/Version.h index 5cdc343d71..96baae06e0 100644 --- a/plugins/Scriver/src/Version.h +++ b/plugins/Scriver/src/Version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 2
#define __MINOR_VERSION 12
#define __RELEASE_NUM 1
-#define __BUILD_NUM 1
+#define __BUILD_NUM 2
#include <stdver.h>
diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h index 198b661de9..bbcc134e9b 100644 --- a/plugins/Scriver/src/commonheaders.h +++ b/plugins/Scriver/src/commonheaders.h @@ -104,7 +104,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HWND SM_FindWindowByContact(MCONTACT hContact);
extern HINSTANCE g_hInst;
-extern CREOleCallback reOleCallback;
extern void ChangeStatusIcons();
extern void LoadInfobarFonts();
extern HCURSOR hDragCursor;
@@ -116,6 +115,7 @@ extern HANDLE hHookWinPopup, hHookWinWrite; extern HCURSOR hCurSplitNS, hCurSplitWE;
extern CREOleCallback reOleCallback;
+extern CREOleCallback2 reOleCallback2;
#define SPLITTER_HEIGHT 4
#define TOOLBAR_HEIGHT 24
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 6ee4faa2ac..830b49d04b 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -30,8 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HCURSOR hCurSplitNS, hCurSplitWE, hCurHyperlinkHand, hDragCursor;
extern HANDLE hHookWinEvt;
extern HANDLE hHookWinPopup;
-extern CREOleCallback reOleCallback;
-extern CREOleCallback2 reOleCallback2;
static void UpdateReadChars(HWND hwndDlg, SrmmWindowData * dat);
@@ -415,11 +413,6 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar }
}
else dat->lastEnterTime = 0;
-
- if (((wParam == VK_INSERT && (GetKeyState(VK_SHIFT) & 0x8000)) || (wParam == 'V' && (GetKeyState(VK_CONTROL) & 0x8000))) && !(GetKeyState(VK_MENU) & 0x8000)) {
- SendMessage(hwnd, WM_PASTE, 0, 0);
- return 0;
- }
break;
case WM_MOUSEWHEEL:
@@ -442,17 +435,18 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar }
break;
+ case EM_PASTESPECIAL:
case WM_PASTE:
if (IsClipboardFormatAvailable(CF_HDROP)) {
if (OpenClipboard(hwnd)) {
HANDLE hDrop = GetClipboardData(CF_HDROP);
if (hDrop)
- SendMessage(hwnd, WM_DROPFILES, (WPARAM)hDrop, 0);
+ SendMessage(GetParent(hwnd), WM_DROPFILES, (WPARAM)hDrop, 0);
CloseClipboard();
}
+ return 0;
}
- else SendMessage(hwnd, EM_PASTESPECIAL, CF_TEXT, 0);
- return 0;
+ break;
case WM_DROPFILES:
SendMessage(GetParent(hwnd), WM_DROPFILES, wParam, lParam);
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 70db6ee54e..913e429db6 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -669,7 +669,7 @@ STDMETHODIMP CREOleCallback::ShowContainerUI(BOOL) STDMETHODIMP CREOleCallback2::QueryAcceptData(LPDATAOBJECT, CLIPFORMAT *lpcfFormat, DWORD, BOOL, HGLOBAL)
{
- *lpcfFormat = CF_TEXT;
+ *lpcfFormat = CF_UNICODETEXT;
return S_OK;
}
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 85fb3b2029..ffcee6f554 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -611,8 +611,8 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar return 0; break; - case WM_PASTE: case EM_PASTESPECIAL: + case WM_PASTE: if (OpenClipboard(hwnd)) { HANDLE hClip = GetClipboardData(CF_TEXT); if (hClip) { diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index ead45174f6..56522f86fe 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -1068,6 +1068,6 @@ STDMETHODIMP CREOleCallback::ShowContainerUI(BOOL) STDMETHODIMP CREOleCallback2::QueryAcceptData(LPDATAOBJECT, CLIPFORMAT *lpcfFormat, DWORD, BOOL, HGLOBAL)
{
- *lpcfFormat = CF_TEXT;
+ *lpcfFormat = CF_UNICODETEXT;
return S_OK;
}
diff --git a/plugins/TabSRMM/src/version.h b/plugins/TabSRMM/src/version.h index 5ad50dd144..dc88e85401 100644 --- a/plugins/TabSRMM/src/version.h +++ b/plugins/TabSRMM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 3
#define __MINOR_VERSION 4
#define __RELEASE_NUM 0
-#define __BUILD_NUM 7
+#define __BUILD_NUM 8
#include <stdver.h>
|