evan/zenity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle close/cancel as unsuccesful

Browse Source
This commit is contained in:
Gabriel Nützi 2021-02-11 16:38:54 +01:00 committed by Nuno Cruces
parent 566c40cbe8
commit 810eb18cd3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlgs_windows.go
View File

@ -520,6 +520,8 @@ func stringFromUtf16Ptr(p *uint16) string {
// editBox displays textedit/inputbox dialog. // editBox displays textedit/inputbox dialog.
func editBox(title, text, defaultText, className string, password bool) (string, bool, error) { func editBox(title, text, defaultText, className string, password bool) (string, bool, error) {
var out string var out string
notCancledOrClosed := true
var hwndEdit syscall.Handle var hwndEdit syscall.Handle
instance, err := getModuleHandle() instance, err := getModuleHandle()
@ -530,11 +532,13 @@ func editBox(title, text, defaultText, className string, password bool) (string,
fn := func(hwnd syscall.Handle, msg uint32, wparam, lparam uintptr) uintptr { fn := func(hwnd syscall.Handle, msg uint32, wparam, lparam uintptr) uintptr {
switch msg { switch msg {
case wmClose: case wmClose:
notCancledOrClosed = false
destroyWindow(hwnd) destroyWindow(hwnd)
case wmDestroy: case wmDestroy:
postQuitMessage(0) postQuitMessage(0)
case wmKeydown: case wmKeydown:
if wparam == vkEscape { if wparam == vkEscape {
notCancledOrClosed = false
destroyWindow(hwnd) destroyWindow(hwnd)
} }
case wmCommand: case wmCommand:
@ -542,6 +546,7 @@ func editBox(title, text, defaultText, className string, password bool) (string,
out = getWindowText(hwndEdit) out = getWindowText(hwndEdit)
destroyWindow(hwnd) destroyWindow(hwnd)
} else if wparam == 110 { } else if wparam == 110 {
notCancledOrClosed = false
destroyWindow(hwnd) destroyWindow(hwnd)
} }
default: default:
@ -589,5 +594,5 @@ func editBox(title, text, defaultText, className string, password bool) (string,
return out, false, err return out, false, err
} }
return out, true, nil return out, notCancledOrClosed, nil
} }