diff options
| author | trustable-code <krauter.simon@arcor.de> | 2018-05-07 20:24:47 +0200 |
|---|---|---|
| committer | trustable-code <krauter.simon@arcor.de> | 2018-05-07 20:24:47 +0200 |
| commit | f4029b8850054b1f3c51f62f776d2fa66226111d (patch) | |
| tree | 5311a68c4d6466bcfea05a23e64f81b59264661f /src | |
| parent | 37e0248d2832c9be9731246b936f3cccfff12cf0 (diff) | |
| download | NiGui-f4029b8850054b1f3c51f62f776d2fa66226111d.tar.gz NiGui-f4029b8850054b1f3c51f62f776d2fa66226111d.zip | |
Rename MouseButtonEvent to MouseEvent
Diffstat (limited to 'src')
| -rwxr-xr-x | src/nigui.nim | 12 | ||||
| -rwxr-xr-x | src/nigui/private/gtk3/platform_impl.nim | 4 | ||||
| -rwxr-xr-x | src/nigui/private/windows/platform_impl.nim | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/nigui.nim b/src/nigui.nim index ca69f7f..f6a89d5 100755 --- a/src/nigui.nim +++ b/src/nigui.nim @@ -253,12 +253,12 @@ type control*: Control DrawProc* = proc(event: DrawEvent) - MouseButtonEvent* = ref object + MouseEvent* = ref object control*: Control button*: MouseButton x*: int y*: int - MouseButtonProc* = proc(event: MouseButtonEvent) + MouseButtonProc* = proc(event: MouseEvent) ClickEvent* = ref object control*: Control @@ -697,9 +697,9 @@ method canvas*(control: Control): Canvas method handleDrawEvent*(control: Control, event: DrawEvent) -method handleMouseButtonDownEvent*(control: Control, event: MouseButtonEvent) +method handleMouseButtonDownEvent*(control: Control, event: MouseEvent) -method handleMouseButtonUpEvent*(control: Control, event: MouseButtonEvent) +method handleMouseButtonUpEvent*(control: Control, event: MouseEvent) method handleClickEvent*(control: Control, event: ClickEvent) @@ -1656,13 +1656,13 @@ method handleDrawEvent(control: Control, event: DrawEvent) = if callback != nil: callback(event) -method handleMouseButtonDownEvent(control: Control, event: MouseButtonEvent) = +method handleMouseButtonDownEvent(control: Control, event: MouseEvent) = # can be implemented by custom control let callback = control.onMouseButtonDown if callback != nil: callback(event) -method handleMouseButtonUpEvent(control: Control, event: MouseButtonEvent) = +method handleMouseButtonUpEvent(control: Control, event: MouseEvent) = # can be implemented by custom control let callback = control.onMouseButtonUp if callback != nil: diff --git a/src/nigui/private/gtk3/platform_impl.nim b/src/nigui/private/gtk3/platform_impl.nim index 1b050a7..f8495f9 100755 --- a/src/nigui/private/gtk3/platform_impl.nim +++ b/src/nigui/private/gtk3/platform_impl.nim @@ -159,7 +159,7 @@ proc pDefaultControlButtonPressSignal(widget: pointer, event: var GdkEventButton let control = cast[ControlImpl](data) let x = event.x.int let y = event.y.int - var evt = new MouseButtonEvent + var evt = new MouseEvent evt.control = control case event.button of 1: evt.button = MouseButton_Left @@ -190,7 +190,7 @@ proc pControlButtonReleaseSignal(widget: pointer, event: var GdkEventButton, dat let y = event.y.int if not (x >= 0 and x < control.width and y >= 0 and y < control.height): return - var evt = new MouseButtonEvent + var evt = new MouseEvent evt.control = control case event.button of 1: evt.button = MouseButton_Left diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim index 47b776c..6f13dd5 100755 --- a/src/nigui/private/windows/platform_impl.nim +++ b/src/nigui/private/windows/platform_impl.nim @@ -1065,7 +1065,7 @@ proc pCommonControlWndProc(hWnd: pointer, uMsg: int32, wParam, lParam: pointer): of WM_RBUTTONDOWN: button = MouseButton_Right of WM_MBUTTONDOWN: button = MouseButton_Middle else: discard - var event = new MouseButtonEvent + var event = new MouseEvent event.control = control event.button = button event.x = x @@ -1087,7 +1087,7 @@ proc pCommonControlWndProc(hWnd: pointer, uMsg: int32, wParam, lParam: pointer): of WM_RBUTTONUP: button = MouseButton_Right of WM_MBUTTONUP: button = MouseButton_Middle else: discard - var event = new MouseButtonEvent + var event = new MouseEvent event.control = control event.button = button event.x = x |
