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

Fixed the Windows code. Now to implement closing properly.

This commit is contained in:
Pietro Gagliardi 2014-07-12 12:59:12 -04:00
parent b944b6d4d8
commit cfb9bcc625
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redo/uitask_windows.go
View File

@ -47,7 +47,7 @@ func uimsgloop() {
func issue(req *Request) { func issue(req *Request) {
res, err := f_PostMessageW( res, err := f_PostMessageW(
hNULL, // TODO msgwin,
msgRequest, msgRequest,
0, 0,
t_LPARAM(uintptr(unsafe.Pointer(req)))) t_LPARAM(uintptr(unsafe.Pointer(req))))

4
redo/window_windows.go
View File

@ -46,7 +46,7 @@ func newWindow(title string, width int, height int) *Request {
0, 0,
windowclassptr, windowclassptr,
syscall.StringToUTF16Ptr(title), syscall.StringToUTF16Ptr(title),
c_WS_OVERLAPPED, c_WS_OVERLAPPEDWINDOW,
c_CW_USEDEFAULT, c_CW_USEDEFAULT, c_CW_USEDEFAULT, c_CW_USEDEFAULT,
uintptr(width), uintptr(height), uintptr(width), uintptr(height),
hNULL, hNULL, hInstance, unsafe.Pointer(w)) hNULL, hNULL, hInstance, unsafe.Pointer(w))
@ -151,6 +151,8 @@ func windowWndProc(hwnd uintptr, msg t_UINT, wParam t_WPARAM, lParam t_LPARAM) t
// the lpParam is available during WM_NCCREATE and WM_CREATE // the lpParam is available during WM_NCCREATE and WM_CREATE
if msg == c_WM_NCCREATE { if msg == c_WM_NCCREATE {
storelpParam(hwnd, lParam) storelpParam(hwnd, lParam)
w := (*window)(unsafe.Pointer(f_GetWindowLongPtrW(hwnd, c_GWLP_USERDATA)))
w.hwnd = hwnd
} }
// act as if we're not ready yet, even during WM_NCCREATE (nothing important to the switch statement below happens here anyway) // act as if we're not ready yet, even during WM_NCCREATE (nothing important to the switch statement below happens here anyway)
return f_DefWindowProcW(hwnd, msg, wParam, lParam) return f_DefWindowProcW(hwnd, msg, wParam, lParam)