Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable cmenu: make CMenuMenuDescMap and MenuIdMap members of CShellExtCMenu

Changeset b0214bb1e7fa…

Parent e9f1a2588a49…

by Adrian Buehlmann

Changes to 4 files · Browse files at b0214bb1e7fa Showing diff from parent e9f1a2588a49 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
122
123
124
125
126
127
128
129
130
131
132
 
122
123
124
 
 
 
 
 
125
126
127
@@ -122,11 +122,6 @@
 ;     -typedef std::map<UINT, MenuDescription> MenuIdCmdMap; - -static MenuDescriptionMap CMenuMenuDescMap; -static MenuIdCmdMap MenuIdMap; -  void CShellExtCMenu::AddMenuList(   UINT idCmd, const std::string& name, MenuDescriptionMap& menuDescMap)  {
Change 1 of 2 Show Entire File win32/​shellext/​CShellExtCMenu.h Stacked
 
16
17
18
 
 
 
19
20
21
 
23
24
25
 
 
26
27
28
 
16
17
18
19
20
21
22
23
24
 
26
27
28
29
30
31
32
33
@@ -16,6 +16,9 @@
   typedef std::map<std::string, MenuDescription> MenuDescriptionMap;   +typedef std::map<UINT, MenuDescription> MenuIdCmdMap; + +  class CShellExtCMenu: public IContextMenu3, IShellExtInit  {   @@ -23,6 +26,8 @@
  ULONG m_cRef;   std::vector<std::string> myFiles;   std::string myFolder; + MenuDescriptionMap CMenuMenuDescMap; + MenuIdCmdMap MenuIdMap;     virtual void RunDialog(const std::string&);   virtual MenuDescriptionMap& GetMenuDescriptionMap();
Change 1 of 1 Show Entire File win32/​shellext/​CShellExtDnd.cpp Stacked
 
24
25
26
27
28
29
30
31
32
33
34
35
 
24
25
26
 
 
 
 
 
 
27
28
29
@@ -24,12 +24,6 @@
  "drag_move drag_copy"  ;   -static MenuDescriptionMap CDndMenuDescMap; - -MenuDescriptionMap& CShellExtDnd::GetMenuDescriptionMap() -{ - return CDndMenuDescMap; -}    #define ResultFromShort(i) ResultFromScode(MAKE_SCODE(SEVERITY_SUCCESS, 0, (USHORT)(i)))  
Change 1 of 1 Show Entire File win32/​shellext/​CShellExtDnd.h Stacked
 
10
11
12
13
14
15
16
 
10
11
12
 
13
14
15
@@ -10,7 +10,6 @@
   protected:   virtual void RunDialog(const std::string&); - virtual MenuDescriptionMap& GetMenuDescriptionMap();    public:   explicit CShellExtDnd(const char dummy);