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: rename CShellExtCMenu::CMenuMenuDescMap to myDescMap

Changeset 06cd980eee1f…

Parent fc2d52bfeebb…

by Adrian Buehlmann

Changes to 2 files · Browse files at 06cd980eee1f Showing diff from parent fc2d52bfeebb Diff from another changeset...

Change 1 of 4 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
125
126
127
128
 
129
130
131
 
166
167
168
169
 
170
171
172
 
187
188
189
190
 
191
192
193
 
298
299
300
301
302
 
 
303
304
305
 
125
126
127
 
128
129
130
131
 
166
167
168
 
169
170
171
172
 
187
188
189
 
190
191
192
193
 
298
299
300
 
 
301
302
303
304
305
@@ -125,7 +125,7 @@
 void CShellExtCMenu::AddMenuList(UINT idCmd, const std::string& name)  {   TDEBUG_TRACE("AddMenuList: idCmd = " << idCmd << " name = " << name); - MenuIdMap[idCmd] = CMenuMenuDescMap[name]; + MenuIdMap[idCmd] = myDescMap[name];  }     @@ -166,7 +166,7 @@
   void CShellExtCMenu::InitMenuMaps(MenuDescription *menuDescs, std::size_t sz)  { - if (CMenuMenuDescMap.empty()) + if (myDescMap.empty())   {   std::string lang;   GetRegistryConfig("CMenuLang", lang); @@ -187,7 +187,7 @@
  if (!lang.empty())   GetCMenuTranslation(lang, md.name, md.menuText, md.helpText);   - CMenuMenuDescMap[md.name] = md; + myDescMap[md.name] = md;   }     } @@ -298,8 +298,8 @@
  HMENU hMenu, const std::string& name, UINT indexMenu,   UINT idCmd, UINT idCmdFirst, const std::wstring& prefix)  { - MenuDescriptionMap::iterator iter = CMenuMenuDescMap.find(name); - if (iter == CMenuMenuDescMap.end()) + MenuDescriptionMap::iterator iter = myDescMap.find(name); + if (iter == myDescMap.end())   {   TDEBUG_TRACE("***** InsertMenuItemByName: can't find menu info for " << name);   return;
Change 1 of 1 Show Entire File win32/​shellext/​CShellExtCMenu.h Stacked
 
26
27
28
29
 
30
31
32
 
26
27
28
 
29
30
31
32
@@ -26,7 +26,7 @@
  ULONG m_cRef;   std::vector<std::string> myFiles;   std::string myFolder; - MenuDescriptionMap CMenuMenuDescMap; + MenuDescriptionMap myDescMap;   MenuIdCmdMap MenuIdMap;     virtual void RunDialog(const std::string&);