gary/c_tray
1
0
Fork 0
forked from Yadciel/c_tray
Code Pull Requests Activity

implemented checked/disabled items with winapi, fixed menu callback crashes

Browse Source
This commit is contained in:
Serge A. Zaitsev
2017-01-09 14:33:49 +02:00
parent 6ecca1fe68
commit 8708a93003
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tray.h
View File

@@ -193,7 +193,7 @@ static LRESULT CALLBACK _tray_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam,
}; };
if (GetMenuItemInfo(hmenu, wparam, FALSE, &item)) { if (GetMenuItemInfo(hmenu, wparam, FALSE, &item)) {
struct tray_menu *menu = (struct tray_menu *)item.dwItemData; struct tray_menu *menu = (struct tray_menu *)item.dwItemData;
menu->cb(menu->context); menu->cb(menu);
} }
return 0; return 0;
} }
@@ -252,6 +252,12 @@ static void tray_update(struct tray *tray) {
item->fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; item->fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA;
item->fType = 0; item->fType = 0;
item->fState = 0; item->fState = 0;
if (m->disabled) {
item->fState |= MFS_DISABLED;
}
if (m->checked) {
item->fState |= MFS_CHECKED;
}
item->wID = i + ID_TRAY_FIRST; item->wID = i + ID_TRAY_FIRST;
item->dwTypeData = m->text; item->dwTypeData = m->text;
item->dwItemData = (ULONG_PTR)m; item->dwItemData = (ULONG_PTR)m;