summaryrefslogtreecommitdiff
path: root/newctrl/container_windows.go
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-10-16 14:09:11 -0400
committerPietro Gagliardi <[email protected]>2014-10-16 14:09:11 -0400
commita1f9dca68cb3597bb76cd57a0504b6cd620cdce8 (patch)
treef205c1a52c4645ea535d9e83f7a183906ac6cbb5 /newctrl/container_windows.go
parent6cefa04d71d80db0dcd5f7daed17e17cb02c688b (diff)
Storing the *container in the Windows GWLP_USERDATA is no longer needed; strip it.
Diffstat (limited to 'newctrl/container_windows.go')
-rw-r--r--newctrl/container_windows.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/newctrl/container_windows.go b/newctrl/container_windows.go
index 91aee8f..521b205 100644
--- a/newctrl/container_windows.go
+++ b/newctrl/container_windows.go
@@ -5,7 +5,6 @@ package ui
import (
"fmt"
"syscall"
- "unsafe"
)
// #include "winapi_windows.h"
@@ -38,10 +37,10 @@ func makeContainerWindowClass() error {
}
func newContainer() *container {
- c := new(container)
- c.controlSingleHWND = newControlSingleHWND(C.newContainer(unsafe.Pointer(c)))
// don't set preferredSize(); it should never be called
- return c
+ return &container{
+ controlSingleHWND: newControlSingleHWND(C.newContainer()),
+ }
}
// TODO merge with controlSingleHWND