summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrustable-code <krauter.simon@arcor.de>2018-05-07 20:29:05 +0200
committertrustable-code <krauter.simon@arcor.de>2018-05-07 20:29:05 +0200
commit684cfa5e63123d4bb4b84d3e52e3e4418e66890a (patch)
tree3069404f3698e0809d3bf261738f65eb69f8e6db /src
parentf4029b8850054b1f3c51f62f776d2fa66226111d (diff)
downloadNiGui-684cfa5e63123d4bb4b84d3e52e3e4418e66890a.tar.gz
NiGui-684cfa5e63123d4bb4b84d3e52e3e4418e66890a.zip
Rename KeyboardEvent.cancel to KeyboardEvent.handled
Diffstat (limited to 'src')
-rwxr-xr-xsrc/nigui.nim2
-rwxr-xr-xsrc/nigui/private/gtk3/platform_impl.nim4
-rwxr-xr-xsrc/nigui/private/windows/platform_impl.nim4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/nigui.nim b/src/nigui.nim
index f6a89d5..f7b0f36 100755
--- a/src/nigui.nim
+++ b/src/nigui.nim
@@ -240,7 +240,7 @@ type
key*: Key
unicode*: int
character*: string # UTF-8 character
- cancel*: bool
+ handled*: bool
KeyboardProc* = proc(event: KeyboardEvent)
# Control events:
diff --git a/src/nigui/private/gtk3/platform_impl.nim b/src/nigui/private/gtk3/platform_impl.nim
index f8495f9..ba4f51a 100755
--- a/src/nigui/private/gtk3/platform_impl.nim
+++ b/src/nigui/private/gtk3/platform_impl.nim
@@ -102,7 +102,7 @@ proc pWindowKeyPressSignal(widget: pointer, event: var GdkEventKey, data: pointe
window.handleKeyDownEvent(evt)
except:
handleException()
- result = evt.cancel
+ result = evt.handled
proc pControlKeyPressSignal(widget: pointer, event: var GdkEventKey, data: pointer): bool {.cdecl.} =
let control = cast[ControlImpl](data)
@@ -121,7 +121,7 @@ proc pControlKeyPressSignal(widget: pointer, event: var GdkEventKey, data: point
control.handleKeyDownEvent(evt)
except:
handleException()
- result = evt.cancel
+ result = evt.handled
proc pWindowIMContextCommitSignal(context: pointer, str: cstring, data: pointer) {.cdecl.} =
let window = cast[WindowImpl](data)
diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim
index 6f13dd5..3251b61 100755
--- a/src/nigui/private/windows/platform_impl.nim
+++ b/src/nigui/private/windows/platform_impl.nim
@@ -243,7 +243,7 @@ proc pHandleWMKEYDOWNOrWMCHAR(window: Window, control: Control, unicode: int): b
windowEvent.character = unicode.pUnicodeCharToUtf8
window.handleKeyDownEvent(windowEvent)
- if windowEvent.cancel:
+ if windowEvent.handled:
return true
if control != nil:
@@ -253,7 +253,7 @@ proc pHandleWMKEYDOWNOrWMCHAR(window: Window, control: Control, unicode: int): b
controlEvent.unicode = windowEvent.unicode
controlEvent.character = windowEvent.character
control.handleKeyDownEvent(controlEvent)
- if controlEvent.cancel:
+ if controlEvent.handled:
return true
# Tabstop: