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

Moved some more data structures to common_windows.go and made more things private.

This commit is contained in:
Pietro Gagliardi 2014-02-11 18:36:13 -05:00
parent bbff3d4f62
commit aa3e2788f3
2 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
common_windows.go
View File

@ -15,46 +15,47 @@ var (
gdi32 = syscall.NewLazyDLL("gdi32.dll") gdi32 = syscall.NewLazyDLL("gdi32.dll")
) )
type HANDLE uintptr type _HANDLE uintptr
type HWND HANDLE type _HWND _HANDLE
type HBRUSH HANDLE type _HBRUSH _HANDLE
type HMENU HANDLE type _HMENU _HANDLE
const ( const (
NULL = 0 _NULL = 0
FALSE = 0 // from windef.h _FALSE = 0 // from windef.h
TRUE = 1 // from windef.h _TRUE = 1 // from windef.h
) )
type ATOM uint16
// TODO pull the thanks for these three from the old wingo source // TODO pull the thanks for these three from the old wingo source
// TODO put these in windows.go // TODO put these in windows.go
type WPARAM uintptr type _WPARAM uintptr
type LPARAM uintptr type _LPARAM uintptr
type LRESULT uintptr type _LRESULT uintptr
func (w WPARAM) LOWORD() uint16 { func (w _WPARAM) LOWORD() uint16 {
// according to windef.h // according to windef.h
return uint16(w & 0xFFFF) return uint16(w & 0xFFFF)
} }
func (w WPARAM) HIWORD() uint16 { func (w _WPARAM) HIWORD() uint16 {
// according to windef.h // according to windef.h
return uint16((w >> 16) & 0xFFFF) return uint16((w >> 16) & 0xFFFF)
} }
func LPARAMFromString(str string) LPARAM { func _LPARAMFromString(str string) _LPARAM {
return LPARAM(unsafe.Pointer(syscall.StringToUTF16Ptr(str))) return _LPARAM(unsafe.Pointer(syscall.StringToUTF16Ptr(str)))
} }
// microsoft's header files do this // microsoft's header files do this
func MAKEINTRESOURCE(what uint16) uintptr { func _MAKEINTRESOURCE(what uint16) uintptr {
return uintptr(what) return uintptr(what)
} }
/*
// TODO migrate
// TODO adorn error messages with which step failed? // TODO adorn error messages with which step failed?
func getText(hwnd HWND) (text string, err error) { func getText(hwnd _HWND) (text string, err error) {
var tc []uint16 var tc []uint16
length, err := SendMessage(hwnd, WM_GETTEXTLENGTH, 0, 0) length, err := SendMessage(hwnd, WM_GETTEXTLENGTH, 0, 0)
@ -71,3 +72,16 @@ func getText(hwnd HWND) (text string, err error) {
} }
return syscall.UTF16ToString(tc), nil return syscall.UTF16ToString(tc), nil
} }
*/
type _POINT struct {
X int32
Y int32
}
type _RECT struct {
Left int32
Top int32
Right int32
Bottom int32
}

21
unmigrated/rectangles_windows.go
View File

@ -1,21 +0,0 @@
// 9 february 2014
package main
import (
// "syscall"
// "unsafe"
)
// TODO merge with common.go?
type POINT struct {
X int32
Y int32
}
type RECT struct {
Left int32
Top int32
Right int32
Bottom int32
}