@@ -61,20 +61,26 @@ MenuManager::~MenuManager()
6161 }
6262}
6363
64-
6564MenuManager* MenuManager::getInstance ()
6665{
6766 return s_menuManager;
6867}
6968
70-
71- MenuManager::MenuManager (HWND hNotepad, HINSTANCE hInst, runScriptFunc runScript)
72- :
69+ MenuManager::MenuManager (HWND hNotepad, HINSTANCE hInst, runScriptFunc runScript) :
7370 m_runScript (runScript),
7471 m_hNotepad (hNotepad),
7572 m_hInst (hInst),
73+ m_dynamicStartIndex(IDX_MAX ),
74+ m_dynamicCount(0 ),
75+ m_originalDynamicCount(0 ),
76+ m_scriptsMenuIndex(IDX_MAX ),
77+ m_stopScriptIndex(IDX_MAX ),
78+ m_runPreviousIndex(IDX_MAX ),
79+ m_originalLastCmdIndex(IDX_MAX ),
7680 m_pythonPluginMenu (NULL ),
81+ m_hScriptsMenu(NULL ),
7782 m_funcItems(NULL ),
83+ m_funcItemCount(0 ),
7884 m_idAllocator(NULL ),
7985 m_dynamicMenuManager(NULL ),
8086 m_originalDynamicMenuManager(NULL ),
@@ -233,12 +239,8 @@ MenuManager::MenuManager(HWND hNotepad, HINSTANCE hInst, runScriptFunc runScript
233239 m_keyMap.insert (KeyMapTD::value_type (VK_OEM_2 , _T (" /" )));
234240
235241 m_keyMap.insert (KeyMapTD::value_type (VK_OEM_102 , _T (" <>" )));
236-
237-
238242}
239243
240-
241-
242244/* This code was shamefully robbed from NppExec from Dovgan Vitaliy*/
243245HMENU MenuManager::getOurMenu ()
244246{
@@ -275,10 +277,8 @@ void MenuManager::stopScriptEnabled(bool enabled)
275277 {
276278 ::EnableMenuItem (pythonPluginMenu, m_stopScriptIndex, MF_BYPOSITION | (enabled ? MF_ENABLED : MF_GRAYED ));
277279 }
278-
279280}
280281
281-
282282bool MenuManager::populateScriptsMenu ()
283283{
284284 m_pythonPluginMenu = getOurMenu ();
0 commit comments