summaryrefslogtreecommitdiff
path: root/src/nigui/private
diff options
context:
space:
mode:
Diffstat (limited to 'src/nigui/private')
-rwxr-xr-xsrc/nigui/private/gtk3/platform_impl.nim11
-rwxr-xr-xsrc/nigui/private/windows/platform_impl.nim15
2 files changed, 8 insertions, 18 deletions
diff --git a/src/nigui/private/gtk3/platform_impl.nim b/src/nigui/private/gtk3/platform_impl.nim
index c66dfba..152f7b6 100755
--- a/src/nigui/private/gtk3/platform_impl.nim
+++ b/src/nigui/private/gtk3/platform_impl.nim
@@ -832,9 +832,9 @@ method `visible=`(control: ControlImpl, visible: bool) =
else:
gtk_widget_hide(control.fHandle)
-proc dummy(widget: pointer, event: var GdkEventButton, data: pointer): bool {.cdecl.} =
- echo "dummy"
- result = true # Stop propagation
+# proc dummy(widget: pointer, event: var GdkEventButton, data: pointer): bool {.cdecl.} =
+ # echo "dummy"
+ # result = true # Stop propagation
method pUpdateScrollBar(control: ControlImpl) =
if control.fScrollableWidth == -1 and control.fScrollableHeight == -1:
@@ -1093,7 +1093,6 @@ method getPadding(frame: NativeFrame): Spacing =
proc init(button: NativeButton) =
button.fHandle = gtk_button_new()
button.Button.init()
- # discard g_signal_connect_data(button.fHandle, "clicked", pWidgetClickSignal, cast[pointer](button))
method `text=`(button: NativeButton, text: string) =
procCall button.Button.`text=`(text)
@@ -1111,10 +1110,6 @@ method naturalWidth(button: NativeButton): int =
gtk_style_context_get_padding(context, GTK_STATE_FLAG_NORMAL, padding)
result = button.getTextLineWidth(button.text) + padding.left + padding.right + 5
-method pAddButtonPressEvent(control: NativeButton) =
- gtk_widget_add_events(control.fHandle, GDK_BUTTON_PRESS_MASK)
- discard g_signal_connect_data(control.fHandle, "button-press-event", pDefaultControlButtonPressSignal, cast[pointer](control))
-
method `enabled=`(button: NativeButton, enabled: bool) =
button.fEnabled = enabled
gtk_widget_set_sensitive(button.fHandle, enabled)
diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim
index fbc833a..1b36d10 100755
--- a/src/nigui/private/windows/platform_impl.nim
+++ b/src/nigui/private/windows/platform_impl.nim
@@ -1280,16 +1280,11 @@ method getPadding(frame: NativeFrame): Spacing =
var pButtonOrigWndProc: pointer
proc pButtonWndProc(hWnd: pointer, uMsg: int32, wParam, lParam: pointer): pointer {.cdecl.} =
- case uMsg
- of WM_KEYDOWN:
- let button = cast[Button](pGetWindowLongPtr(hWnd, GWLP_USERDATA))
- # if button != nil and (cast[int](wParam) == 13 or cast[int](wParam) == 32):
- if button != nil and cast[int](wParam) == 13:
- var event = new ClickEvent
- event.control = button
- button.handleClickEvent(event)
- else:
- discard
+ # case uMsg
+ # of WM_KEYDOWN:
+ # let button = cast[Button](pGetWindowLongPtr(hWnd, GWLP_USERDATA))
+ # else:
+ # discard
let comProcRes = pCommonControlWndProc(hWnd, uMsg, wParam, lParam)
if comProcRes == PWndProcResult_False:
return cast[pointer](false)