Migrated uitask_windows.go to the new string handling.
This commit is contained in:
parent
c5df1b1afc
commit
05828236ec
|
@ -123,13 +123,14 @@ func msgloop() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
var (
|
||||||
msghandlerclass = "gomsghandler"
|
msghandlerclass = toUTF16("gomsghandler")
|
||||||
|
msghandlertitle = toUTF16("ui package message window")
|
||||||
)
|
)
|
||||||
|
|
||||||
func makeMessageHandler() (hwnd _HWND, err error) {
|
func makeMessageHandler() (hwnd _HWND, err error) {
|
||||||
wc := &_WNDCLASS{
|
wc := &_WNDCLASS{
|
||||||
lpszClassName: uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(msghandlerclass))),
|
lpszClassName: utf16ToArg(msghandlerclass),
|
||||||
lpfnWndProc: syscall.NewCallback(messageHandlerWndProc),
|
lpfnWndProc: syscall.NewCallback(messageHandlerWndProc),
|
||||||
hInstance: hInstance,
|
hInstance: hInstance,
|
||||||
hIcon: icon,
|
hIcon: icon,
|
||||||
|
@ -144,8 +145,8 @@ func makeMessageHandler() (hwnd _HWND, err error) {
|
||||||
|
|
||||||
r1, _, err = _createWindowEx.Call(
|
r1, _, err = _createWindowEx.Call(
|
||||||
uintptr(0),
|
uintptr(0),
|
||||||
uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(msghandlerclass))),
|
utf16ToArg(msghandlerclass),
|
||||||
uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr("ui package message window"))),
|
utf16ToArg(msghandlertitle),
|
||||||
uintptr(0),
|
uintptr(0),
|
||||||
negConst(_CW_USEDEFAULT),
|
negConst(_CW_USEDEFAULT),
|
||||||
negConst(_CW_USEDEFAULT),
|
negConst(_CW_USEDEFAULT),
|
||||||
|
|
Loading…
Reference in New Issue