Fix contextmenu accident modify cause compile error.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseShell / ShellExt.h

diff --git a/src/TortoiseShell/ShellExt.h b/src/TortoiseShell/ShellExt.h
index 16a4793..906589a 100644 (file)
--- a/src/TortoiseShell/ShellExt.h
+++ b/src/TortoiseShell/ShellExt.h
@@ -24,7 +24,7 @@
 #include "ShellCache.h"\r
 #include "RemoteCacheLink.h"\r
 #include "GitStatus.h"\r
-//#include "SVNFolderStatus.h"\r
+#include "GitFolderStatus.h"\r
 #include "uxtheme.h"\r
 \r
 extern UINT                            g_cRefThisDll;                  // Reference count of this DLL.\r
@@ -141,15 +141,22 @@ protected:
                ShellMenuUnIgnoreSub,\r
                ShellMenuUnIgnoreCaseSensitive,\r
                ShellMenuUnIgnore,\r
-               ShellMenuLock,\r
-               ShellMenuUnlock,\r
-               ShellMenuUnlockForce,\r
+//             ShellMenuLock,\r
+//             ShellMenuUnlock,\r
+//             ShellMenuUnlockForce,\r
                ShellMenuProperties,\r
                ShellMenuDelUnversioned,\r
                ShellMenuClipPaste,\r
                ShellMenuPull,\r
                ShellMenuPush,\r
                ShellMenuClone,\r
+               ShellMenuBranch,\r
+               ShellMenuTag,\r
+               ShellMenuFormatPatch,\r
+               ShellMenuImportPatch,\r
+               ShellMenuCherryPick,\r
+               ShellMenuFetch,\r
+               ShellMenuRebase,\r
                ShellMenuLastEntry                      // used to mark the menu array end\r
        };\r
 \r
@@ -198,21 +205,21 @@ protected:
        stdstring itemshorturl;\r
        stdstring ignoredprops;\r
        stdstring owner;\r
-//     git_revnum_t columnrev;                 ///< holds the corresponding revision to the file/dir above\r
+       git_revnum_t columnrev;                 ///< holds the corresponding revision to the file/dir above\r
        git_wc_status_kind      filestatus;\r
        std::map<UINT, HBITMAP> bitmaps;\r
 \r
-//     SVNFolderStatus         m_CachedStatus;         // status cache\r
+       GitFolderStatus         m_CachedStatus;         // status cache\r
        CRemoteCacheLink        m_remoteCacheLink;\r
 \r
        FN_GetBufferedPaintBits pfnGetBufferedPaintBits;\r
        FN_BeginBufferedPaint pfnBeginBufferedPaint;\r
        FN_EndBufferedPaint pfnEndBufferedPaint;\r
 \r
-#define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))\r
+#define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))\r
 private:\r
        void                    InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, GitCommands com, UINT uFlags);\r
-       void                    InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons);\r
+       void                    InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons, UINT uFlags);\r
        stdstring               WriteFileListToTempFile();\r
        bool                    WriteClipboardPathsToTempFile(stdstring& tempfile);\r
        LPCTSTR                 GetMenuTextFromResource(int id);\r