Support rc-defined menus and demo

Author: whtiehack

README.md

@@ -179,7 +179,7 @@ https://docs.microsoft.com/zh-cn/windows/win32/controls/window-controls
 
 - [ ] Hot Key
 - [ ] Accelerator
-- [ ] Menu
+- [x] Menu
 
 </details>
 

examples/basic/main.go

@@ -31,33 +31,22 @@ func main() {
 		log.Panic("main dialog create error", err)
 	}
 
-	// Menu demo
-	const (
-		idMenuExit   = 60001
-		idMenuHello  = 60002
-		idMenuToggle = 60003
-	)
-	menu := wingui.NewMenu()
-	fileMenu := wingui.NewPopupMenu()
-	_ = fileMenu.AppendItem(idMenuExit, "Exit")
-	_ = menu.AppendSubMenu(fileMenu, "File")
-
-	demoMenu := wingui.NewPopupMenu()
-	_ = demoMenu.AppendItem(idMenuHello, "Hello MessageBox")
-	_ = demoMenu.AppendItem(idMenuToggle, "Toggle Checked")
-	_ = menu.AppendSubMenu(demoMenu, "Demo")
-
+	// Menu demo (menu loaded from ui.rc resource)
+	menu := wingui.NewMenuFromResource(IDM_MAINMENU)
 	_ = dlg.SetMenu(menu)
+	demoMenu := menu.SubMenu(1)
 	checked := false
 	dlg.OnCommand = func(id uint16) {
 		switch id {
-		case idMenuExit:
+		case IDM_FILE_EXIT:
 			dlg.Close()
-		case idMenuHello:
+		case IDM_DEMO_HELLO:
 			wingui.MessageBox(dlg.Handle(), "Hello from Menu", "Menu", win.MB_OK|win.MB_ICONINFORMATION)
-		case idMenuToggle:
+		case IDM_DEMO_TOGGLE:
 			checked = !checked
-			demoMenu.CheckItem(idMenuToggle, checked)
+			if demoMenu != nil {
+				demoMenu.CheckItem(IDM_DEMO_TOGGLE, checked)
+			}
 		}
 	}
 	dlg.SetIcon(IDI_ICON1)

examples/basic/resource.h.go

@@ -46,3 +46,8 @@
 #define IDC_TREE_EXPAND                         40031
 #define IDC_TREE_COLLAPSE                       40032
 #define IDC_TREE_LABEL                          40033
+
+#define IDM_MAINMENU                            50000
+#define IDM_FILE_EXIT                           50001
+#define IDM_DEMO_HELLO                          50002
+#define IDM_DEMO_TOGGLE                         50003

examples/basic/ui.syso

@@ -29,6 +29,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 IDD_DIALOG DIALOG 0, 0, 365, 188
 STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_GROUP | WS_POPUP | WS_SYSMENU
 CAPTION "Dialog Hello"
+MENU IDM_MAINMENU
 FONT 8, "Ms Shell Dlg"
 {
     CONTROL         "", IDC_TAB1, WC_TABCONTROL, 0, 197, 57, 160, 105, WS_EX_LEFT
@@ -82,6 +83,20 @@ FONT 8, "Ms Shell Dlg"
     LTEXT           "Count: 0", IDC_TAB_LABEL_COUNT, 7, 76, 141, 9, SS_LEFT, WS_EX_LEFT
 }
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDM_MAINMENU MENU
+{
+    POPUP "&File"
+    {
+        MENUITEM "E&xit", IDM_FILE_EXIT
+    }
+    POPUP "&Demo"
+    {
+        MENUITEM "&Hello MessageBox", IDM_DEMO_HELLO
+        MENUITEM "Toggle &Checked", IDM_DEMO_TOGGLE
+    }
+}
+
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG_RICH DIALOG 0, 0, 153, 86
 STYLE DS_3DLOOK | DS_CENTER | DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU

examples/basic/ui/resource.h

@@ -8,12 +8,56 @@ import (
 	"github.com/whtiehack/wingui/winapi"
 )
 
+/*
+Manual menu creation example:
+
+	const (
+		idExit   = 60001
+		idHello  = 60002
+		idToggle = 60003
+	)
+
+	menu := wingui.NewMenu()
+	fileMenu := wingui.NewPopupMenu()
+	_ = fileMenu.AppendItem(idExit, "Exit")
+	_ = menu.AppendSubMenu(fileMenu, "File")
+
+	demoMenu := wingui.NewPopupMenu()
+	_ = demoMenu.AppendItem(idHello, "Hello MessageBox")
+	_ = demoMenu.AppendItem(idToggle, "Toggle Checked")
+	_ = menu.AppendSubMenu(demoMenu, "Demo")
+
+	_ = dlg.SetMenu(menu)
+
+	checked := false
+	dlg.OnCommand = func(id uint16) {
+		switch id {
+		case idExit:
+			dlg.Close()
+		case idHello:
+			wingui.MessageBox(dlg.Handle(), "Hello from Menu", "Menu", win.MB_OK|win.MB_ICONINFORMATION)
+		case idToggle:
+			checked = !checked
+			demoMenu.CheckItem(idToggle, checked)
+		}
+	}
+*/
+
 // Menu wraps a Win32 HMENU.
 type Menu struct {
 	hMenu win.HMENU
 	count uint32
 }
 
+// NewMenuFromResource loads a menu resource by id (from the module hInstance).
+func NewMenuFromResource(id uintptr) *Menu {
+	h := win.LoadMenu(hInstance, win.MAKEINTRESOURCE(id))
+	if h == 0 {
+		return nil
+	}
+	return &Menu{hMenu: h}
+}
+
 // Handle returns the underlying HMENU.
 func (m *Menu) Handle() win.HMENU {
 	if m == nil {
@@ -22,6 +66,18 @@ func (m *Menu) Handle() win.HMENU {
 	return m.hMenu
 }
 
+// SubMenu returns the submenu at the given position (0-based), or nil.
+func (m *Menu) SubMenu(pos int32) *Menu {
+	if m == nil || m.hMenu == 0 {
+		return nil
+	}
+	h := winapi.GetSubMenu(m.hMenu, pos)
+	if h == 0 {
+		return nil
+	}
+	return &Menu{hMenu: h}
+}
+
 // Destroy releases the underlying HMENU.
 func (m *Menu) Destroy() bool {
 	if m == nil || m.hMenu == 0 {

examples/basic/ui/ui.rc

@@ -31,6 +31,7 @@ var (
 	switchToWindow     = libuser32.NewProc("SwitchToThisWindow")
 	sendMessageTimeout = libuser32.NewProc("SendMessageTimeoutW")
 	trackPopupMenuEx   = libuser32.NewProc("TrackPopupMenuEx")
+	getSubMenu         = libuser32.NewProc("GetSubMenu")
 )
 
 // FindWindowEx user32 API FindWindowEx
@@ -88,3 +89,9 @@ func TrackPopupMenuEx(hMenu win.HMENU, flags uint32, x, y int32, hWnd win.HWND)
 	)
 	return uint32(ret)
 }
+
+// GetSubMenu wraps user32!GetSubMenu.
+func GetSubMenu(hMenu win.HMENU, pos int32) win.HMENU {
+	ret, _, _ := getSubMenu.Call(uintptr(hMenu), uintptr(pos))
+	return win.HMENU(ret)
+}