summaryrefslogtreecommitdiff
path: root/sysdata_windows.go
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-02-12 10:43:57 -0500
committerPietro Gagliardi <[email protected]>2014-02-12 10:43:57 -0500
commit3f8fe0e7108c1cd87e177bed22e3307c9df03e63 (patch)
treee34a7dd419bf2649dc24f5dbf89e6d825179f55d /sysdata_windows.go
parentf93bebfeec42aeee07f43fcf6466b93f073b6111 (diff)
Separated initial text from sysData and fixed errors in the previous commits.
Diffstat (limited to 'sysdata_windows.go')
-rw-r--r--sysdata_windows.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdata_windows.go b/sysdata_windows.go
index acc7070..2d0796e 100644
--- a/sysdata_windows.go
+++ b/sysdata_windows.go
@@ -42,7 +42,7 @@ var classTypes = [nctypes]*classData{
var (
cid _HMENU = 0
- cidLock sys.Mutex
+ cidLock sync.Mutex
)
func nextID() _HMENU {
@@ -52,7 +52,7 @@ func nextID() _HMENU {
return cid
}
-func (s *sysData) make() (err error) {
+func (s *sysData) make(initText string) (err error) {
ret := make(chan uiret)
defer close(ret)
ct := classTypes[s.ctype]
@@ -64,7 +64,7 @@ func (s *sysData) make() (err error) {
p: []uintptr{
uintptr(ct.xstyle),
uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(ct.name))),
- uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(s.text))),
+ uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(initText))),
uintptr(ct.style),
uintptr(_CW_USEDEFAULT), // TODO
uintptr(_CW_USEDEFAULT),