diff options
| author | Pietro Gagliardi <[email protected]> | 2014-02-24 14:16:05 -0500 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-02-24 14:16:05 -0500 |
| commit | b166c0f1146c77a50f3c20d03680602feb79873c (patch) | |
| tree | 545814342d4fc5718bc2c1941d3248135f2ec06c /prefsize_windows.go | |
| parent | 4c6ce9639ffe9a4de3de4c06f8267eb97dcd0951 (diff) | |
And the uitask message fixed was the issue all along. Now it works.
Diffstat (limited to 'prefsize_windows.go')
| -rw-r--r-- | prefsize_windows.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/prefsize_windows.go b/prefsize_windows.go index 2580b50..9598cb0 100644 --- a/prefsize_windows.go +++ b/prefsize_windows.go @@ -55,39 +55,32 @@ var stdDlgSizes = [nctypes]dlgunits{ } var ( - _getTextMetrics = user32.NewProc("GetTextMetricsW") + _getTextMetrics = gdi32.NewProc("GetTextMetricsW") _getWindowDC = user32.NewProc("GetWindowDC") _releaseDC = user32.NewProc("ReleaseDC") ) func (s *sysData) preferredSize() (width int, height int) { -println("size of control", s.ctype) var dc _HANDLE var tm _TEXTMETRICS var baseX, baseY int -println("calling getWindowDC") r1, _, err := _getWindowDC.Call(uintptr(s.hwnd)) -println("getWindowDC",r1,err) if r1 == 0 { // failure panic(err) // TODO return it instead } dc = _HANDLE(r1) -println("getTextMetrics") r1, _, err = _getTextMetrics.Call( uintptr(dc), uintptr(unsafe.Pointer(&tm))) -println("getTextMetrics",r1,err) if r1 == 0 { // failure panic(err) // TODO return it instead } baseX = int(tm.tmAveCharWidth) // TODO not optimal; third reference has better way baseY = int(tm.tmHeight) -println("releaseDC") r1, _, err = _releaseDC.Call( uintptr(s.hwnd), uintptr(dc)) -println("releaseDC",r1,err) if r1 == 0 { // failure panic(err) // TODO return it instead } @@ -100,7 +93,6 @@ println("releaseDC",r1,err) height = stdDlgSizes[s.ctype].height width = muldiv(width, baseX, 4) // equivalent to right of rect height = muldiv(height, baseY, 8) // equivalent to bottom of rect -println("result:", width, height) return width, height } |
