Fix ListView messages and improve basic demo

Author: whtiehack

examples/basic/main.go

@@ -198,6 +198,12 @@ func bindWidgets(dlg *wingui.Dialog) {
 		idx := lv1.InsertItem(-1, "Item "+strconv.Itoa(i))
 		lv1.SetItemText(idx, 1, "V"+strconv.Itoa(i))
 	}
+	lv1.OnItemChanged = func(index int) {
+		sel := lv1.SelectedIndex()
+		if sel >= 0 {
+			tab1.SetText("Page1 - selected: " + lv1.GetItemText(sel, 0))
+		}
+	}
 	lv1.OnItemActivate = func(index int) {
 		if index < 0 {
 			return
@@ -211,7 +217,12 @@ func bindWidgets(dlg *wingui.Dialog) {
 	tabBtn.OnClicked = func() {
 		n := int(atomic.AddInt32(&addSeq, 1) - 1)
 		idx := lv1.InsertItem(-1, "Item "+strconv.Itoa(n))
+		if idx < 0 {
+			tabBtn.MessageBox("InsertItem failed", "ListView", win.MB_OK|win.MB_ICONERROR)
+			return
+		}
 		lv1.SetItemText(idx, 1, "V"+strconv.Itoa(n))
+		tab1.SetText("Page1 - count: " + strconv.Itoa(lv1.ItemCount()))
 	}
 	tabcontrol.AddDialogPage("Page1", tab1)
 

listview.go

@@ -5,7 +5,6 @@ import (
 	"unsafe"
 
 	"github.com/lxn/win"
-	"github.com/whtiehack/wingui/winapi"
 )
 
 // ListView is a wrapper for the Win32 SysListView32 control.
@@ -21,6 +20,8 @@ type ListView struct {
 	OnItemChanged func(index int)
 }
 
+const lvmGetItemCount = win.LVM_FIRST + 4
+
 func (lv *ListView) WndProc(msg uint32, wParam, lParam uintptr) uintptr {
 	switch msg {
 	case win.WM_NOTIFY:
@@ -48,7 +49,7 @@ func (lv *ListView) WndProc(msg uint32, wParam, lParam uintptr) uintptr {
 
 // SetExtendedStyle sets extended list-view styles (e.g. LVS_EX_FULLROWSELECT).
 func (lv *ListView) SetExtendedStyle(style uint32) {
-	lv.SendMessage(winapi.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, uintptr(style))
+	lv.SendMessage(win.LVM_SETEXTENDEDLISTVIEWSTYLE, 0, uintptr(style))
 }
 
 // InsertColumn inserts a column at index and returns the actual inserted index (or -1).
@@ -61,7 +62,7 @@ func (lv *ListView) InsertColumn(index int, text string, width int, fmt int32) i
 		PszText: &utf16[0],
 		ISubItem: int32(index),
 	}
-	ret := lv.SendMessage(winapi.LVM_INSERTCOLUMNW, uintptr(index), uintptr(unsafe.Pointer(&col)))
+	ret := lv.SendMessage(win.LVM_INSERTCOLUMN, uintptr(index), uintptr(unsafe.Pointer(&col)))
 	return int(int32(ret))
 }
 
@@ -77,7 +78,7 @@ func (lv *ListView) InsertItem(index int, text string) int {
 		ISubItem: 0,
 		PszText:  &utf16[0],
 	}
-	ret := lv.SendMessage(winapi.LVM_INSERTITEMW, 0, uintptr(unsafe.Pointer(&item)))
+	ret := lv.SendMessage(win.LVM_INSERTITEM, 0, uintptr(unsafe.Pointer(&item)))
 	return int(int32(ret))
 }
 
@@ -89,7 +90,7 @@ func (lv *ListView) SetItemText(itemIndex int, subItem int, text string) bool {
 		ISubItem: int32(subItem),
 		PszText:  &utf16[0],
 	}
-	ret := lv.SendMessage(winapi.LVM_SETITEMTEXTW, uintptr(itemIndex), uintptr(unsafe.Pointer(&item)))
+	ret := lv.SendMessage(win.LVM_SETITEMTEXT, uintptr(itemIndex), uintptr(unsafe.Pointer(&item)))
 	return ret != 0
 }
 
@@ -102,28 +103,28 @@ func (lv *ListView) GetItemText(itemIndex int, subItem int) string {
 		CchTextMax:  int32(len(buf)),
 		PszText:     &buf[0],
 	}
-	lv.SendMessage(winapi.LVM_GETITEMTEXTW, uintptr(itemIndex), uintptr(unsafe.Pointer(&item)))
+	lv.SendMessage(win.LVM_GETITEMTEXT, uintptr(itemIndex), uintptr(unsafe.Pointer(&item)))
 	return syscall.UTF16ToString(buf)
 }
 
 // ItemCount returns the number of items in the list.
 func (lv *ListView) ItemCount() int {
-	return int(int32(lv.SendMessage(winapi.LVM_GETITEMCOUNT, 0, 0)))
+	return int(int32(lv.SendMessage(lvmGetItemCount, 0, 0)))
 }
 
 // DeleteAllItems deletes all items.
 func (lv *ListView) DeleteAllItems() bool {
-	return lv.SendMessage(winapi.LVM_DELETEALLITEMS, 0, 0) != 0
+	return lv.SendMessage(win.LVM_DELETEALLITEMS, 0, 0) != 0
 }
 
 // DeleteItem deletes an item at index.
 func (lv *ListView) DeleteItem(index int) bool {
-	return lv.SendMessage(winapi.LVM_DELETEITEM, uintptr(index), 0) != 0
+	return lv.SendMessage(win.LVM_DELETEITEM, uintptr(index), 0) != 0
 }
 
 // SelectedIndex returns the first selected item index, or -1 if none.
 func (lv *ListView) SelectedIndex() int {
-	ret := lv.SendMessage(winapi.LVM_GETNEXTITEM, ^uintptr(0), uintptr(win.LVNI_SELECTED))
+	ret := lv.SendMessage(win.LVM_GETNEXTITEM, ^uintptr(0), uintptr(win.LVNI_SELECTED))
 	return int(int32(ret))
 }
 

wingui.go

@@ -53,13 +53,20 @@ import (
 	"runtime"
 	"sync/atomic"
 	"syscall"
+	"unsafe"
 )
 
 var hInstance win.HINSTANCE
 
 func init() {
 	log.SetOutput(os.Stdout)
 	InitHInstance("")
+	// Ensure common controls classes (ListView/Tab/Progress etc.) are registered.
+	icc := win.INITCOMMONCONTROLSEX{
+		DwSize: uint32(unsafe.Sizeof(win.INITCOMMONCONTROLSEX{})),
+		DwICC:  win.ICC_WIN95_CLASSES,
+	}
+	win.InitCommonControlsEx(&icc)
 }
 
 // InitHInstance init hInstance,used by Dialog APIs.