From 0fb45ba84d7a948508b30e0b140910ae906b4d9d Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 3 Aug 2014 20:42:45 -0400 Subject: [PATCH] Did the previous commit, but for the Windows backend. --- redo/button_windows.go | 2 +- redo/checkbox_windows.go | 2 +- redo/control_windows.go | 7 ++++++- redo/label_windows.go | 2 +- redo/tab_windows.go | 2 +- redo/table_windows.go | 2 +- redo/textfield_windows.go | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/redo/button_windows.go b/redo/button_windows.go index 5deb53d..71ed17a 100644 --- a/redo/button_windows.go +++ b/redo/button_windows.go @@ -91,5 +91,5 @@ func (b *button) commitResize(a *allocation, d *sizing) { } func (b *button) getAuxResizeInfo(d *sizing) { - basegetAuxResizeInfo(d) + basegetAuxResizeInfo(b, d) } diff --git a/redo/checkbox_windows.go b/redo/checkbox_windows.go index 4c44bdd..5ffce28 100644 --- a/redo/checkbox_windows.go +++ b/redo/checkbox_windows.go @@ -94,5 +94,5 @@ func (c *checkbox) commitResize(a *allocation, d *sizing) { } func (c *checkbox) getAuxResizeInfo(d *sizing) { - basegetAuxResizeInfo(d) + basegetAuxResizeInfo(c, d) } diff --git a/redo/control_windows.go b/redo/control_windows.go index 90e41be..ac3297e 100644 --- a/redo/control_windows.go +++ b/redo/control_windows.go @@ -5,6 +5,11 @@ package ui // #include "winapi_windows.h" import "C" +type controlPrivate interface { + // TODO + Control +} + type controlbase struct { hwnd C.HWND parent C.HWND // for Tab and Group @@ -43,7 +48,7 @@ func basecommitResize(c *controlbase, a *allocation, d *sizing) { C.moveWindow(c.hwnd, C.int(a.x), C.int(a.y), C.int(a.width), C.int(a.height)) } -func basegetAuxResizeInfo(d *sizing) { +func basegetAuxResizeInfo(c controlPrivate, d *sizing) { // do nothing } diff --git a/redo/label_windows.go b/redo/label_windows.go index 516a14c..d0e03eb 100644 --- a/redo/label_windows.go +++ b/redo/label_windows.go @@ -80,5 +80,5 @@ func (l *label) commitResize(c *allocation, d *sizing) { } func (l *label) getAuxResizeInfo(d *sizing) { - basegetAuxResizeInfo(d) + basegetAuxResizeInfo(l, d) } diff --git a/redo/tab_windows.go b/redo/tab_windows.go index 032da7e..da97c2c 100644 --- a/redo/tab_windows.go +++ b/redo/tab_windows.go @@ -116,5 +116,5 @@ func (t *tab) commitResize(c *allocation, d *sizing) { } func (t *tab) getAuxResizeInfo(d *sizing) { - basegetAuxResizeInfo(d) + basegetAuxResizeInfo(t, d) } diff --git a/redo/table_windows.go b/redo/table_windows.go index 633486e..60b8fe0 100644 --- a/redo/table_windows.go +++ b/redo/table_windows.go @@ -84,5 +84,5 @@ func (t *table) commitResize(a *allocation, d *sizing) { } func (t *table) getAuxResizeInfo(d *sizing) { - basegetAuxResizeInfo(d) + basegetAuxResizeInfo(t, d) } diff --git a/redo/textfield_windows.go b/redo/textfield_windows.go index a2add7a..abb2780 100644 --- a/redo/textfield_windows.go +++ b/redo/textfield_windows.go @@ -69,5 +69,5 @@ func (t *textField) commitResize(a *allocation, d *sizing) { } func (t *textField) getAuxResizeInfo(d *sizing) { - basegetAuxResizeInfo(d) + basegetAuxResizeInfo(t, d) }