diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-02-24 12:55:18 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-02-24 12:55:18 +0000 |
| commit | 20656c75f8bcdf67a25df7c2c172916b361c1c42 (patch) | |
| tree | 56ec405e3b64ecbcfd8d3e5cf37ca93a9d77552c | |
| parent | ca93bacd8e69427b24109ade3b955a9bb8d47f9a (diff) | |
| parent | e45b97265ad6f5d9999d073d3526669dbb1b2970 (diff) | |
Merge branch 'cygwin-patches-for-1.15' into cygwin-release-1.15xserver-cygwin-1.15.0-3
| -rw-r--r-- | hw/xwin/winclipboard/internal.h | 1 | ||||
| -rw-r--r-- | hw/xwin/winclipboard/thread.c | 4 | ||||
| -rw-r--r-- | hw/xwin/winclipboard/wndproc.c | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/hw/xwin/winclipboard/internal.h b/hw/xwin/winclipboard/internal.h index bcf45ca4d..c6bde84af 100644 --- a/hw/xwin/winclipboard/internal.h +++ b/hw/xwin/winclipboard/internal.h @@ -44,6 +44,7 @@ #define WIN_XEVENTS_NOTIFY_TARGETS 4 #define WM_WM_REINIT (WM_USER + 1) +#define WM_WM_QUIT (WM_USER + 2) /* * References to external symbols diff --git a/hw/xwin/winclipboard/thread.c b/hw/xwin/winclipboard/thread.c index 1653747ea..b80258196 100644 --- a/hw/xwin/winclipboard/thread.c +++ b/hw/xwin/winclipboard/thread.c @@ -344,7 +344,7 @@ winClipboardProc(Bool fUseUnicode, char *szDisplay) winClipboardProc_Done: /* Close our Windows window */ if (g_hwndClipboard) { - winClipboardWindowDestroy(); + DestroyWindow(g_hwndClipboard); } /* Close our X window */ @@ -484,7 +484,7 @@ void winClipboardWindowDestroy(void) { if (g_hwndClipboard) { - SendMessage(g_hwndClipboard, WM_DESTROY, 0, 0); + SendMessage(g_hwndClipboard, WM_WM_QUIT, 0, 0); } } diff --git a/hw/xwin/winclipboard/wndproc.c b/hw/xwin/winclipboard/wndproc.c index b5566fa5a..423dcade3 100644 --- a/hw/xwin/winclipboard/wndproc.c +++ b/hw/xwin/winclipboard/wndproc.c @@ -154,6 +154,12 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) ChangeClipboardChain(hwnd, s_hwndNextViewer); s_hwndNextViewer = NULL; + } + return 0; + + case WM_WM_QUIT: + { + winDebug("winClipboardWindowProc - WM_WM_QUIT\n"); PostQuitMessage(0); } |