shiny/driver/internal/win32: translate WM_CLOSE into lifecycle.StageDead

Fixes golang/go#14187 Change-Id: I1fcf1063c6fcca096fbf1a53d4e16038bcc726fa Reviewed-on: https://go-review.googlesource.com/20185 Reviewed-by: Nigel Tao <nigeltao@golang.org>
golang · Mar 5, 2016 · 671c795 · 671c795
1 parent dd592c1
commit 671c795
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/shiny/driver/internal/win32/syscall_windows.go b/shiny/driver/internal/win32/syscall_windows.go
@@ -64,6 +64,7 @@ const (
 	_WM_SETFOCUS         = 7
 	_WM_KILLFOCUS        = 8
 	_WM_PAINT            = 15
+	_WM_CLOSE            = 16
 	_WM_WINDOWPOSCHANGED = 71
 	_WM_KEYDOWN          = 256
 	_WM_KEYUP            = 257

diff --git a/shiny/driver/internal/win32/win32.go b/shiny/driver/internal/win32/win32.go
@@ -159,6 +159,11 @@ func sendSize(hwnd syscall.Handle) {
 	})
 }
 
+func sendClose(hwnd syscall.Handle, uMsg uint32, wParam, lParam uintptr) (lResult uintptr) {
+	LifecycleEvent(hwnd, lifecycle.StageDead)
+	return 0
+}
+
 func sendMouseEvent(hwnd syscall.Handle, uMsg uint32, wParam, lParam uintptr) (lResult uintptr) {
 	e := mouse.Event{
 		X:         float32(_GET_X_LPARAM(lParam)),
@@ -295,6 +300,7 @@ var windowMsgs = map[uint32]func(hwnd syscall.Handle, uMsg uint32, wParam, lPara
 	_WM_PAINT:            sendPaint,
 	msgShow:              sendShow,
 	_WM_WINDOWPOSCHANGED: sendSizeEvent,
+	_WM_CLOSE:            sendClose,
 
 	_WM_LBUTTONDOWN: sendMouseEvent,
 	_WM_LBUTTONUP:   sendMouseEvent,