From a46668ca22cc1407177eb559288744ea0d6a96dc Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 3 Jun 2014 10:52:53 -0400 Subject: [PATCH] Migrated stdwndclass_windows.go to the new string handling. --- stdwndclass_windows.go | 6 +++--- sysdata_windows.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stdwndclass_windows.go b/stdwndclass_windows.go index 3c189a7..09cce8d 100644 --- a/stdwndclass_windows.go +++ b/stdwndclass_windows.go @@ -8,8 +8,8 @@ import ( "unsafe" ) -const ( - stdWndClass = "gouiwnd" +var ( + stdWndClass = toUTF16("gouiwnd") ) var ( @@ -139,7 +139,7 @@ var ( func registerStdWndClass() (err error) { wc := &_WNDCLASS{ - lpszClassName: uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(stdWndClass))), + lpszClassName: utf16ToArg(stdWndClass), lpfnWndProc: syscall.NewCallback(stdWndProc), hInstance: hInstance, hIcon: icon, diff --git a/sysdata_windows.go b/sysdata_windows.go index cbdd51a..9526b23 100644 --- a/sysdata_windows.go +++ b/sysdata_windows.go @@ -44,7 +44,7 @@ const controlxstyle = 0 var classTypes = [nctypes]*classData{ c_window: &classData{ - name: toUTF16(stdWndClass), + name: stdWndClass, style: _WS_OVERLAPPEDWINDOW, xstyle: 0, storeSysData: true,