// { ShellMenuCheckout, MENUCHECKOUT, IDI_CHECKOUT, IDS_MENUCHECKOUT, IDS_MENUDESCCHECKOUT,\r
// ITEMIS_FOLDER, ITEMIS_INSVN|ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0, 0 },\r
\r
-// { ShellMenuUpdate, MENUUPDATE, IDI_UPDATE, IDS_MENUUPDATE, IDS_MENUDESCUPDATE, \r
-// ITEMIS_INSVN, ITEMIS_ADDED, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+// { ShellMenuUpdate, MENUSUBUPDATE, IDI_UPDATE, IDS_MENUUPDATE, IDS_MENUDESCUPDATE, \r
+// ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+\r
\r
{ ShellMenuCommit, MENUCOMMIT, IDI_COMMIT, IDS_MENUCOMMIT, IDS_MENUDESCCOMMIT,\r
ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
{ ShellMenuShowChanged, MENUSHOWCHANGED, IDI_SHOWCHANGED, IDS_MENUSHOWCHANGED, IDS_MENUDESCSHOWCHANGED,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, 0, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0},\r
\r
- { ShellMenuRebase, MENUREBASE, IDI_SHOWCHANGED, IDS_MENUREBASE, IDS_MENUREBASE,\r
+ { ShellMenuRebase, MENUREBASE, IDI_REBASE, IDS_MENUREBASE, IDS_MENUREBASE,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, 0, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0},\r
\r
// { ShellMenuRevisionGraph, MENUREVISIONGRAPH, IDI_REVISIONGRAPH, IDS_MENUREVISIONGRAPH, IDS_MENUDESCREVISIONGRAPH,\r
// ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, 0, 0, 0, 0},\r
\r
+ { ShellMenuStashSave, MENUSTASHSAVE, IDI_COMMIT, IDS_MENUSTASHSAVE, IDS_MENUSTASHSAVE,\r
+ ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+ { ShellMenuStashApply, MENUSTASHAPPLY, IDI_RELOCATE, IDS_MENUSTASHAPPLY, IDS_MENUSTASHAPPLY,\r
+ ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+\r
{ ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},\r
\r
{ ShellMenuConflictEditor, MENUCONFLICTEDITOR, IDI_CONFLICT, IDS_MENUCONFLICT, IDS_MENUDESCCONFLICT,\r
ITEMIS_INSVN|ITEMIS_CONFLICTED, ITEMIS_FOLDER, 0, 0, 0, 0, 0, 0 },\r
\r
-// { ShellMenuResolve, MENURESOLVE, IDI_RESOLVE, IDS_MENURESOLVE, IDS_MENUDESCRESOLVE,\r
-// ITEMIS_INSVN|ITEMIS_CONFLICTED, 0, ITEMIS_INSVN|ITEMIS_FOLDER, 0, ITEMIS_FOLDERINSVN, 0, 0, 0 },\r
+ { ShellMenuResolve, MENURESOLVE, IDI_RESOLVE, IDS_MENURESOLVE, IDS_MENUDESCRESOLVE,\r
+ ITEMIS_INSVN|ITEMIS_CONFLICTED, 0, ITEMIS_INSVN|ITEMIS_FOLDER, 0, ITEMIS_FOLDERINSVN, 0, 0, 0 },\r
\r
-// { ShellMenuUpdateExt, MENUUPDATEEXT, IDI_UPDATE, IDS_MENUUPDATEEXT, IDS_MENUDESCUPDATEEXT,\r
-// ITEMIS_INSVN, ITEMIS_ADDED, ITEMIS_FOLDERINSVN, ITEMIS_ADDED, 0, 0, 0, 0 },\r
\r
{ ShellMenuRename, MENURENAME, IDI_RENAME, IDS_MENURENAME, IDS_MENUDESCRENAME,\r
ITEMIS_INSVN|ITEMIS_ONLYONE|ITEMIS_INVERSIONEDFOLDER, 0, 0, 0, 0, 0, 0, 0 },\r
\r
{ ShellMenuMerge, MENUMERGE, IDI_MERGE, IDS_MENUMERGE, IDS_MENUDESCMERGE,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
- { ShellMenuMergeAll, MENUMERGEALL, IDI_MERGE, IDS_MENUMERGEALL, IDS_MENUDESCMERGEALL,\r
- ITEMIS_INSVN|ITEMIS_ONLYONE|ITEMIS_EXTENDED, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE|ITEMIS_EXTENDED, 0, 0, 0, 0, 0 },\r
+// { ShellMenuMergeAll, MENUMERGEALL, IDI_MERGE, IDS_MENUMERGEALL, IDS_MENUDESCMERGEALL,\r
+// ITEMIS_INSVN|ITEMIS_ONLYONE|ITEMIS_EXTENDED, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE|ITEMIS_EXTENDED, 0, 0, 0, 0, 0 },\r
\r
{ ShellMenuBranch, MENUCOPY, IDI_COPY, IDS_MENUBRANCH, IDS_MENUDESCCOPY,\r
ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
\r
{ ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},\r
\r
+ { ShellMenuSubAdd, MENUSUBADD, IDI_ADD, IDS_MENUSUBADD, IDS_MENUSUBADD,\r
+ ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+\r
+ { ShellMenuUpdateExt, MENUUPDATEEXT, IDI_UPDATE, IDS_MENUUPDATEEXT, IDS_MENUDESCUPDATEEXT,\r
+ ITEMIS_INSVN, ITEMIS_ADDED, ITEMIS_FOLDERINSVN, ITEMIS_ADDED, 0, 0, 0, 0 },\r
+\r
+\r
+ { ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},\r
+\r
// { ShellMenuCherryPick, MENUCHERRYPICK, IDI_CREATEPATCH, IDS_MENUCHERRYPICK, IDS_MENUDESCCREATEPATCH,\r
// ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
\r
\r
\r
{ ShellMenuCreatePatch, MENUCREATEPATCH, IDI_CREATEPATCH, IDS_MENUCREATEPATCH, IDS_MENUDESCCREATEPATCH,\r
- ITEMIS_INSVN, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+ ITEMIS_INSVN|ITEMIS_EXTENDED, ITEMIS_NORMAL, ITEMIS_FOLDERINSVN|ITEMIS_EXTENDED, 0, 0, 0, 0, 0 },\r
\r
{ ShellMenuApplyPatch, MENUAPPLYPATCH, IDI_PATCH, IDS_MENUAPPLYPATCH, IDS_MENUDESCAPPLYPATCH,\r
- ITEMIS_INSVN|ITEMIS_FOLDER|ITEMIS_FOLDERINSVN, ITEMIS_ADDED, ITEMIS_ONLYONE|ITEMIS_PATCHFILE, 0, ITEMIS_FOLDERINSVN, ITEMIS_ADDED, 0, 0 },\r
+ ITEMIS_INSVN|ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_EXTENDED, ITEMIS_ADDED, ITEMIS_ONLYONE|ITEMIS_PATCHFILE|ITEMIS_EXTENDED, 0, ITEMIS_FOLDERINSVN|ITEMIS_EXTENDED, ITEMIS_ADDED, 0, 0 },\r
\r
- { ShellMenuProperties, MENUPROPERTIES, IDI_PROPERTIES, IDS_MENUPROPERTIES, IDS_MENUDESCPROPERTIES,\r
- ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
+// { ShellMenuProperties, MENUPROPERTIES, IDI_PROPERTIES, IDS_MENUPROPERTIES, IDS_MENUDESCPROPERTIES,\r
+// ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
\r
{ ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},\r
// { ShellMenuClipPaste, MENUCLIPPASTE, IDI_CLIPPASTE, IDS_MENUCLIPPASTE, IDS_MENUDESCCLIPPASTE,\r
\r
void CShellExt::InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, GitCommands com, UINT uFlags)\r
{\r
- TCHAR menutextbuffer[255] = {0};\r
+ TCHAR menutextbuffer[512] = {0};\r
TCHAR verbsbuffer[255] = {0};\r
MAKESTRING(stringid);\r
\r
_tcscpy_s(menutextbuffer, 255, _T("Git "));\r
}\r
_tcscat_s(menutextbuffer, 255, stringtablebuffer);\r
- if ((fullver < 0x500)||(fullver == 0x500 && !uFlags))\r
+#if 1\r
+ // insert branch name into "Git Commit..." entry, so it looks like "Git Commit "master"..."\r
+ // so we have an easy and fast way to check the current branch\r
+ // (the other alternative is using a separate disabled menu entry, the code is already done but commented out)\r
+ if (com == ShellMenuCommit)\r
+ {\r
+ // get branch name\r
+ CTGitPath path(folder_.empty() ? files_.front().c_str() : folder_.c_str());\r
+ CString sProjectRoot;\r
+ CString sBranchName;\r
+\r
+ if (path.HasAdminDir(&sProjectRoot) && !g_Git.GetCurrentBranchFromFile(sProjectRoot, sBranchName))\r
+ {\r
+ if (sBranchName.GetLength() == 40)\r
+ {\r
+ // if SHA1 only show 4 first bytes\r
+ BOOL bIsSha1 = TRUE;\r
+ for (int i=0; i<40; i++)\r
+ if ( !iswxdigit(sBranchName[i]) )\r
+ {\r
+ bIsSha1 = FALSE;\r
+ break;\r
+ }\r
+ if (bIsSha1)\r
+ sBranchName = sBranchName.Left(8) + _T("....");\r
+ }\r
+\r
+ // sanity check\r
+ if (sBranchName.GetLength() > 64)\r
+ sBranchName = sBranchName.Left(64) + _T("...");\r
+\r
+ // scan to before "..."\r
+ LPTSTR s = menutextbuffer + _tcslen(menutextbuffer)-1;\r
+ if (s > menutextbuffer)\r
+ {\r
+ while (s > menutextbuffer)\r
+ {\r
+ if (*s != _T('.'))\r
+ {\r
+ s++;\r
+ break;\r
+ }\r
+ s--;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ s = menutextbuffer;\r
+ }\r
+\r
+ // append branch name and end with ...\r
+ _tcscpy(s, _T(" -> \"") + sBranchName + _T("\"..."));\r
+ }\r
+ }\r
+#endif\r
+ if ((fullver < 0x500)||(fullver == 0x500 && !(uFlags&~(CMF_RESERVED|CMF_EXPLORE))))\r
{\r
+ // on win2k, the context menu does not work properly if we use\r
+ // icon bitmaps. At least the menu text is empty in the context menu\r
+ // for folder backgrounds (seems like a win2k bug).\r
+ // the workaround is to use the check/unchecked bitmaps, which are drawn\r
+ // with AND raster op, but it's better than nothing at all\r
InsertMenu(menu, pos, MF_BYPOSITION | MF_STRING , id, menutextbuffer);\r
- if (fullver >= 0x500)\r
+ if (icon)\r
{\r
- // on win2k, the context menu does not work properly if we use\r
- // icon bitmaps. At least the menu text is empty in the context menu\r
- // for folder backgrounds (seems like a win2k bug).\r
HBITMAP bmp = IconToBitmap(icon); \r
SetMenuItemBitmaps(menu, pos, MF_BYPOSITION, bmp, bmp);\r
}\r
}\r
else\r
{\r
- MENUITEMINFO menuiteminfo = {0};\r
+ MENUITEMINFO menuiteminfo;\r
+ SecureZeroMemory(&menuiteminfo, sizeof(menuiteminfo));\r
menuiteminfo.cbSize = sizeof(menuiteminfo);\r
- menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_BITMAP | MIIM_STRING;\r
+ menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING;\r
menuiteminfo.fType = MFT_STRING;\r
menuiteminfo.dwTypeData = menutextbuffer;\r
if (icon)\r
+ {\r
+ menuiteminfo.fMask |= MIIM_BITMAP;\r
menuiteminfo.hbmpItem = (fullver >= 0x600) ? IconToBitmapPARGB32(icon) : HBMMENU_CALLBACK;\r
+ }\r
menuiteminfo.wID = id;\r
InsertMenuItem(menu, pos, TRUE, &menuiteminfo);\r
}\r
// insert separator at start\r
InsertMenu(hMenu, indexMenu++, MF_SEPARATOR|MF_BYPOSITION, 0, NULL); idCmd++;\r
bool bShowIcons = !!DWORD(CRegStdWORD(_T("Software\\TortoiseGit\\ShowContextMenuIcons"), TRUE));\r
- // ?? TortoiseSVN had this as (fullver <= 0x0500) this disabled icons in win2k, but icons work fine in win2k\r
- if (fullver < 0x0500)\r
- bShowIcons = false;\r
+ // ?? TSV disabled icons for win2k and earlier, but they work for win2k and should work for win95 and up\r
+ /*if (fullver <= 0x500)\r
+ bShowIcons = false;*/\r
+\r
+#if 0\r
+ if (itemStates & (ITEMIS_INSVN|ITEMIS_FOLDERINSVN))\r
+ {\r
+ // show current branch name (as a "read-only" menu entry)\r
+\r
+ CTGitPath path(folder_.empty() ? files_.front().c_str() : folder_.c_str());\r
+ CString sProjectRoot;\r
+ CString sBranchName;\r
+\r
+ if (path.HasAdminDir(&sProjectRoot) && !g_Git.GetCurrentBranchFromFile(sProjectRoot, sBranchName))\r
+ {\r
+ if (sBranchName.GetLength() == 40)\r
+ {\r
+ // if SHA1 only show 4 first bytes\r
+ BOOL bIsSha1 = TRUE;\r
+ for (int i=0; i<40; i++)\r
+ if ( !iswxdigit(sBranchName[i]) )\r
+ {\r
+ bIsSha1 = FALSE;\r
+ break;\r
+ }\r
+ if (bIsSha1)\r
+ sBranchName = sBranchName.Left(8) + _T("....");\r
+ }\r
+\r
+ sBranchName = _T('"') + sBranchName + _T('"');\r
+\r
+ const int icon = IDI_COPY;\r
+ const int pos = indexMenu++;\r
+ const int id = idCmd++;\r
+\r
+ if ((fullver < 0x500)||(fullver == 0x500 && !(uFlags&~(CMF_RESERVED|CMF_EXPLORE))))\r
+ {\r
+ InsertMenu(hMenu, pos, MF_DISABLED|MF_GRAYED|MF_BYPOSITION|MF_STRING, id, sBranchName);\r
+ HBITMAP bmp = IconToBitmap(icon); \r
+ SetMenuItemBitmaps(hMenu, pos, MF_BYPOSITION, bmp, bmp);\r
+ }\r
+ else\r
+ {\r
+ MENUITEMINFO menuiteminfo;\r
+ SecureZeroMemory(&menuiteminfo, sizeof(menuiteminfo));\r
+ menuiteminfo.cbSize = sizeof(menuiteminfo);\r
+ menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_STATE;\r
+ menuiteminfo.fState = MFS_DISABLED;\r
+ menuiteminfo.fType = MFT_STRING;\r
+ menuiteminfo.dwTypeData = (LPWSTR)sBranchName.GetString();\r
+ if (icon)\r
+ {\r
+ menuiteminfo.fMask |= MIIM_BITMAP;\r
+ menuiteminfo.hbmpItem = (fullver >= 0x600) ? IconToBitmapPARGB32(icon) : HBMMENU_CALLBACK;\r
+\r
+ if (menuiteminfo.hbmpItem == HBMMENU_CALLBACK)\r
+ {\r
+ // WM_DRAWITEM uses myIDMap to get icon, we use the same icon as create branch\r
+ myIDMap[id - idCmdFirst] = ShellMenuBranch;\r
+ myIDMap[id] = ShellMenuBranch;\r
+ }\r
+ }\r
+ menuiteminfo.wID = id;\r
+ InsertMenuItem(hMenu, pos, TRUE, &menuiteminfo);\r
+ }\r
+ }\r
+ }\r
+#endif\r
+\r
while (menuInfo[menuIndex].command != ShellMenuLastEntry)\r
{\r
if (menuInfo[menuIndex].command == ShellSeparator)\r
// handle special cases (sub menus)\r
if ((menuInfo[menuIndex].command == ShellMenuIgnoreSub)||(menuInfo[menuIndex].command == ShellMenuUnIgnoreSub))\r
{\r
- InsertIgnoreSubmenus(idCmd, idCmdFirst, hMenu, subMenu, indexMenu, indexSubMenu, topmenu, bShowIcons);\r
+ InsertIgnoreSubmenus(idCmd, idCmdFirst, hMenu, subMenu, indexMenu, indexSubMenu, topmenu, bShowIcons, uFlags);\r
bMenuEntryAdded = true;\r
bMenuEmpty = false;\r
}\r
myIDMap[idCmd] = ShellSubMenu;\r
}\r
HBITMAP bmp = NULL;\r
- if ((fullver < 0x500)||(fullver == 0x500 && !uFlags))\r
+ if ((fullver < 0x500)||(fullver == 0x500 && !(uFlags&~(CMF_RESERVED|CMF_EXPLORE))))\r
{\r
- bmp = IconToBitmap(uIcon);\r
- menuiteminfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA;\r
+ menuiteminfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU | MIIM_DATA;\r
+ if (uIcon)\r
+ {\r
+ menuiteminfo.fMask |= MIIM_CHECKMARKS;\r
+ bmp = IconToBitmap(uIcon);\r
+ menuiteminfo.hbmpChecked = bmp;\r
+ menuiteminfo.hbmpUnchecked = bmp;\r
+ }\r
}\r
else\r
{\r
- menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_SUBMENU | MIIM_DATA | MIIM_BITMAP | MIIM_STRING;\r
- if (bShowIcons)\r
+ menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_SUBMENU | MIIM_DATA | MIIM_STRING;\r
+ if (uIcon)\r
+ {\r
+ menuiteminfo.fMask |= MIIM_BITMAP;\r
menuiteminfo.hbmpItem = (fullver >= 0x600) ? IconToBitmapPARGB32(uIcon) : HBMMENU_CALLBACK;\r
+ }\r
}\r
- menuiteminfo.hbmpChecked = bmp;\r
- menuiteminfo.hbmpUnchecked = bmp;\r
menuiteminfo.hSubMenu = subMenu;\r
menuiteminfo.wID = idCmd++;\r
InsertMenuItem(hMenu, indexMenu++, TRUE, &menuiteminfo);\r
break;\r
case ShellMenuUpdateExt:\r
tempfile = WriteFileListToTempFile();\r
- svnCmd += _T("update /pathfile:\"");\r
+ svnCmd += _T("subupdate /pathfile:\"");\r
svnCmd += tempfile;\r
svnCmd += _T("\"");\r
svnCmd += _T(" /deletepathfile");\r
svnCmd += folder_;\r
svnCmd += _T("\"");\r
break;\r
+\r
+ case ShellMenuStashSave:\r
+ svnCmd += _T("stashsave /path:\"");\r
+ if (files_.size() > 0)\r
+ svnCmd += files_.front();\r
+ else\r
+ svnCmd += folder_;\r
+ svnCmd += _T("\"");\r
+ break;\r
+\r
+ case ShellMenuStashApply:\r
+ svnCmd += _T("stashapply /path:\"");\r
+ if (files_.size() > 0)\r
+ svnCmd += files_.front();\r
+ else\r
+ svnCmd += folder_;\r
+ svnCmd += _T("\"");\r
+ break;\r
+\r
+ case ShellMenuSubAdd:\r
+ svnCmd += _T("subadd /path:\"");\r
+ if (files_.size() > 0)\r
+ svnCmd += files_.front();\r
+ else\r
+ svnCmd += folder_;\r
+ svnCmd += _T("\"");\r
+ break;\r
+\r
case ShellMenuBlame:\r
svnCmd += _T("blame /path:\"");\r
if (files_.size() > 0)\r
case WM_MEASUREITEM:\r
{\r
MEASUREITEMSTRUCT* lpmis = (MEASUREITEMSTRUCT*)lParam;\r
- if (lpmis==NULL)\r
+ if (lpmis==NULL||lpmis->CtlType!=ODT_MENU)\r
break;\r
lpmis->itemWidth += 2;\r
if (lpmis->itemHeight < 16)\r
return false;\r
}\r
\r
-void CShellExt::InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons)\r
+void CShellExt::InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons, UINT uFlags)\r
{\r
HMENU ignoresubmenu = NULL;\r
int indexignoresub = 0;\r
MENUITEMINFO menuiteminfo;\r
SecureZeroMemory(&menuiteminfo, sizeof(menuiteminfo));\r
menuiteminfo.cbSize = sizeof(menuiteminfo);\r
- menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_SUBMENU | MIIM_DATA | MIIM_BITMAP | MIIM_STRING;\r
+ if (fullver < 0x500 || (fullver == 0x500 && !(uFlags&~(CMF_RESERVED|CMF_EXPLORE))))\r
+ {\r
+ menuiteminfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU | MIIM_DATA;\r
+ if (icon)\r
+ {\r
+ HBITMAP bmp = IconToBitmap(icon);\r
+ menuiteminfo.fMask |= MIIM_CHECKMARKS;\r
+ menuiteminfo.hbmpChecked = bmp;\r
+ menuiteminfo.hbmpUnchecked = bmp;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ menuiteminfo.fMask = MIIM_FTYPE | MIIM_ID | MIIM_SUBMENU | MIIM_DATA | MIIM_STRING;\r
+ if (icon)\r
+ {\r
+ menuiteminfo.fMask |= MIIM_BITMAP;\r
+ menuiteminfo.hbmpItem = (fullver >= 0x600) ? IconToBitmapPARGB32(icon) : HBMMENU_CALLBACK;\r
+ }\r
+ }\r
menuiteminfo.fType = MFT_STRING;\r
- HBITMAP bmp = (fullver >= 0x600) ? IconToBitmapPARGB32(icon) : IconToBitmap(icon);\r
- if (icon)\r
- menuiteminfo.hbmpItem = (fullver >= 0x600) ? bmp : HBMMENU_CALLBACK;\r
- menuiteminfo.hbmpChecked = bmp;\r
- menuiteminfo.hbmpUnchecked = bmp;\r
menuiteminfo.hSubMenu = ignoresubmenu;\r
menuiteminfo.wID = idCmd;\r
SecureZeroMemory(stringtablebuffer, sizeof(stringtablebuffer));\r
OSDN Git Service
