Changed the font loading on Windows to always load the control font unless a flag to not load any font is set; when menus and statusbars are added, they need special casing. This also means the preferred size calculations reads controlFont directly (it will need the same change).

1 files changed, 1 insertions, 1 deletions

diff --git a/prefsize_windows.go b/prefsize_windows.go
index 9a16f8d..68b54b9 100644
--- a/prefsize_windows.go
+++ b/prefsize_windows.go
@@ -82,7 +82,7 @@ func (s *sysData) preferredSize() (width int, height int) {
 	dc = _HANDLE(r1)
 	r1, _, err = _selectObject.Call(
 		uintptr(dc),
-		uintptr(unsafe.Pointer(*classTypes[s.ctype].font)))
+		uintptr(controlFont))
 	if r1 == 0  {		// failure
 		panic(fmt.Errorf("error loading control font into device context for preferred size calculation: %v", err))
 	}