interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added the widget container to the GTK+ code.

This commit is contained in:
Pietro Gagliardi 2014-07-14 16:32:45 -04:00
parent 0e7589af47
commit daafb7aef8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
redo/window_unix.go
View File

@ -18,6 +18,9 @@ type window struct {
bin *C.GtkBin bin *C.GtkBin
window *C.GtkWindow window *C.GtkWindow
layoutc *C.GtkContainer
layout *C.GtkLayout
closing *event closing *event
} }
@ -28,11 +31,14 @@ func newWindow(title string, width int, height int) *Request {
widget := C.gtk_window_new(C.GTK_WINDOW_TOPLEVEL) widget := C.gtk_window_new(C.GTK_WINDOW_TOPLEVEL)
ctitle := togstr(title) ctitle := togstr(title)
defer freegstr(ctitle) defer freegstr(ctitle)
layoutw := C.gtk_layout_new(nil, nil)
w := &window{ w := &window{
widget: widget, widget: widget,
container: (*C.GtkContainer)(unsafe.Pointer(widget)), container: (*C.GtkContainer)(unsafe.Pointer(widget)),
bin: (*C.GtkBin)(unsafe.Pointer(widget)), bin: (*C.GtkBin)(unsafe.Pointer(widget)),
window: (*C.GtkWindow)(unsafe.Pointer(widget)), window: (*C.GtkWindow)(unsafe.Pointer(widget)),
layoutc: (*C.GtkContainer)(unsafe.Pointer(layoutw)),
layout: (*C.GtkLayout)(unsafe.Pointer(layoutw)),
closing: newEvent(), closing: newEvent(),
} }
C.gtk_window_set_title(w.window, ctitle) C.gtk_window_set_title(w.window, ctitle)
@ -42,7 +48,7 @@ func newWindow(title string, width int, height int) *Request {
C.GCallback(C.windowClosing), C.GCallback(C.windowClosing),
C.gpointer(unsafe.Pointer(w))) C.gpointer(unsafe.Pointer(w)))
// TODO size // TODO size
// TODO content C.gtk_container_add(w.container, layoutw)
c <- w c <- w
}, },
resp: c, resp: c,