Added the beginninig of the Windows Control code.

3 files changed, 109 insertions, 3 deletions

diff --git a/redo/controls_windows.go b/redo/controls_windows.go
new file mode 100644
index 0000000..b661b99
--- /dev/null
+++ b/redo/controls_windows.go
@@ -0,0 +1,108 @@
+// 15 july 2014
+
+package ui
+
+import (
+	"fmt"
+	"syscall"
+)
+
+type widgetbase struct {
+	hwnd	uintptr
+}
+
+var emptystr = syscall.StringToUTF16Ptr("")
+
+func newWidget(class *uint16, style uintptr, extstyle uintptr) *widgetbase {
+	hwnd, err := f_CreateWindowExW(
+		extstyle,
+		class, emptystr,
+		style | c_WS_CHILD | c_WS_VISIBLE,
+		c_CW_USEDEFAULT, c_CW_USEDEFAULT,
+		c_CW_USEDEFAULT, c_CW_USEDEFAULT,
+		// the following has the consequence of making the control message-only at first
+		// this shouldn't cause any problems... hopefully not
+		// but see the msgwndproc() for caveat info
+		// also don't use low control IDs as they will conflict with dialog boxes (IDCANCEL, etc.)
+		msgwin, 100, hInstance, nil)
+	if hwnd == hNULL {
+		panic(fmt.Errorf("creating control of class %q failed: %v", class, err))
+	}
+	return &widgetbase{
+		hwnd:	hwnd,
+	}
+}
+
+// these few methods are embedded by all the various Controls since they all will do the same thing
+
+func (w *widgetbase) unparent() {
+	res, err := f_SetParent(w.hwnd, msgwin)
+	if res == hNULL {		// result type is HWND
+		panic(fmt.Errorf("error unparenting control: %v", err))
+	}
+}
+
+func (w *widgetbase) parent(win *window) {
+	res, err := f_SetParent(w.hwnd, win.hwnd)
+	if res == hNULL {		// result type is HWND
+		panic(fmt.Errorf("error parenting control: %v", err))
+	}
+}
+
+// don't embed these as exported; let each Control decide if it should
+
+func (w *widgetbase) text() *Request {
+	c := make(chan interface{})
+	return &Request{
+		op:		func() {
+			c <- getWindowText(w.hwnd)
+		},
+		resp:		c,
+	}
+}
+
+func (w *widgetbase) settext(text string, results ...t_LRESULT) *Request {
+	c := make(chan interface{})
+	return &Request{
+		op:		func() {
+			setWindowText(w.hwnd, text, append([]t_LRESULT{c_FALSE}, results...))
+			c <- struct{}{}
+		},
+		resp:		c,
+	}
+}
+
+type button struct {
+	*widgetbase
+}
+
+var buttonclass = syscall.StringToUTF16Ptr("BUTTON")
+
+func newButton(text string) *Request {
+	c := make(chan interface{})
+	return &Request{
+		op:		func() {
+			w := newWidget(buttonclass,
+				c_BS_PUSHBUTTON | c_WS_TABSTOP,
+				0)
+			setWindowText(w.hwnd, text, []t_LRESULT{c_FALSE})
+			c <- &button{
+				widgetbase:	w,
+			}
+		},
+		resp:		c,
+	}
+}
+
+func (b *button) OnClicked(e func(c Doer)) *Request {
+	// TODO
+	return nil
+}
+
+func (b *button) Text() *Request {
+	return b.text()
+}
+
+func (b *button) SetText(text string) *Request {
+	return b.settext(text)
+}
diff --git a/redo/funcnames_windows.go b/redo/funcnames_windows.go
index 1309881..0054277 100644
--- a/redo/funcnames_windows.go
+++ b/redo/funcnames_windows.go
@@ -28,3 +28,4 @@ package ui
 // wfunc user32 DestroyWindow uintptr uintptr
 // wfunc user32 PostQuitMessage uintptr void
 // wfunc user32 GetClientRect uintptr *s_RECT uintptr
+// wfunc user32 SetParent uintptr uintptr uintptr
diff --git a/redo/window_windows.go b/redo/window_windows.go
index f09ba3b..4fb971f 100644
--- a/redo/window_windows.go
+++ b/redo/window_windows.go
@@ -185,6 +185,3 @@ func windowWndProc(hwnd uintptr, msg t_UINT, wParam t_WPARAM, lParam t_LPARAM) t
 	}
 	panic(fmt.Errorf("Window message %d does not return a value (bug in windowWndProc())", msg))
 }
-
-// TODO
-func newButton(string)*Request{return nil}
\ No newline at end of file