diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 6b6159eb1..079adb787 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -6764,11 +6764,11 @@ bool Notepad_plus::reloadLang() } if (_tabPopupDropMenu.isCreated()) { - _nativeLangSpeaker.changeLangTabDrapContextMenu(_tabPopupDropMenu.getMenuHandle()); + _nativeLangSpeaker.changeLangTabDropContextMenu(_tabPopupDropMenu.getMenuHandle()); } if (_fileSwitcherMultiFilePopupMenu.isCreated()) { - //_nativeLangSpeaker.changeLangTabDrapContextMenu(_fileSwitcherMultiFilePopupMenu.getMenuHandle()); + //_nativeLangSpeaker.changeLangTabDropContextMenu(_fileSwitcherMultiFilePopupMenu.getMenuHandle()); } if (_preference.isCreated()) { diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp index a2afbf029..865b1654c 100644 --- a/PowerEditor/src/NppNotification.cpp +++ b/PowerEditor/src/NppNotification.cpp @@ -244,7 +244,7 @@ BOOL Notepad_plus::notify(SCNotification *notification) itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_GOTO_ANOTHER_VIEW, goToView)); itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_CLONE_TO_ANOTHER_VIEW, cloneToView)); _tabPopupDropMenu.create(_pPublicInterface->getHSelf(), itemUnitArray, _mainMenuHandle); - _nativeLangSpeaker.changeLangTabDrapContextMenu(_tabPopupDropMenu.getMenuHandle()); + _nativeLangSpeaker.changeLangTabDropContextMenu(_tabPopupDropMenu.getMenuHandle()); } _tabPopupDropMenu.display(p); } diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp index 366a862a1..95c8b67a9 100644 --- a/PowerEditor/src/localization.cpp +++ b/PowerEditor/src/localization.cpp @@ -443,7 +443,7 @@ void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM) } } -void NativeLangSpeaker::changeLangTabDrapContextMenu(HMENU hCM) +void NativeLangSpeaker::changeLangTabDropContextMenu(HMENU hCM) { const int POS_GO2VIEW = 0; const int POS_CLONE2VIEW = 1; @@ -465,10 +465,10 @@ void NativeLangSpeaker::changeLangTabDrapContextMenu(HMENU hCM) { TiXmlElementA *element = childNode->ToElement(); int ordre; - element->Attribute("CMID", &ordre); - if (ordre == 5) + element->Attribute("CMDID", &ordre); + if (ordre == IDM_VIEW_GOTO_ANOTHER_VIEW) goToViewA = element->Attribute("name"); - else if (ordre == 6) + else if (ordre == IDM_VIEW_CLONE_TO_ANOTHER_VIEW) cloneToViewA = element->Attribute("name"); } } diff --git a/PowerEditor/src/localization.h b/PowerEditor/src/localization.h index 165ab2761..ba5e3f588 100644 --- a/PowerEditor/src/localization.h +++ b/PowerEditor/src/localization.h @@ -44,7 +44,7 @@ public: void changeLangTabContextMenu(HMENU hCM); TiXmlNodeA * searchDlgNode(TiXmlNodeA *node, const char *dlgTagName); bool changeDlgLang(HWND hDlg, const char *dlgTagName, char *title = NULL, size_t titleMaxSize = 0); - void changeLangTabDrapContextMenu(HMENU hCM); + void changeLangTabDropContextMenu(HMENU hCM); generic_string getSpecialMenuEntryName(const char *entryName) const; generic_string getNativeLangMenuString(int itemID) const; generic_string getShortcutNameString(int itemID) const;