Merge branch 'jl/LH-2/fix_crash_user_def_style' into pu

* jl/LH-2/fix_crash_user_def_style: User defined languages: fix undefined lang crash. [#2 state:proposed]
npp-community · Oct 23, 2009 · a7bb650 · a7bb650
2 parents 75a97c7 + 4275494
commit a7bb650
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
@@ -8030,7 +8030,12 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 			}
 
 			// Add User Define Languages Entry
-			int udlpos = ::GetMenuItemCount(hLangMenu) - 1;
+			int udlpos = ::GetMenuItemCount(hLangMenu);
+
+			if (pNppParam->getNbUserLang() > 0)
+			{
+				::InsertMenu(hLangMenu, udlpos++, MF_BYPOSITION|MF_SEPARATOR, 0, TEXT(""));
+			}
 
 			for (int i = 0 ; i < pNppParam->getNbUserLang() ; i++)
 			{

diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
@@ -438,8 +438,6 @@ BEGIN
         MENUITEM "Verilog",    IDM_LANG_VERILOG
         MENUITEM "XML",                IDM_LANG_XML
         MENUITEM "YAML",               IDM_LANG_YAML
-        MENUITEM SEPARATOR
-        MENUITEM "User-Defined",        IDM_LANG_USER
     END
 	POPUP "&Language"
 	BEGIN
@@ -530,8 +528,6 @@ BEGIN
 	END
 	MENUITEM "XML",                IDM_LANG_XML
 	MENUITEM "YAML",               IDM_LANG_YAML
-	MENUITEM SEPARATOR
-	MENUITEM "User-Defined",        IDM_LANG_USER
 	END
 
     POPUP "Se&ttings"

diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp b/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
@@ -1737,6 +1737,9 @@ BOOL CALLBACK UserDefineDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM
 								::PostMessage(_hSelf, WM_COMMAND, IDC_RENAME_BUTTON, 0);
 								return TRUE;
 							}
+
+							bool needMenuSeparator = (pNppParam->getNbUserLang() == 0);
+
 							//add current language in userLangArray at the end as a new lang
 							UserLangContainer & userLang = (wParam == IDC_SAVEAS_BUTTON)?pNppParam->getULCFromIndex(i-1):*_pCurrentUserLang;
 							int newIndex = pNppParam->addUserLangToEnd(userLang, newName);
@@ -1748,6 +1751,11 @@ BOOL CALLBACK UserDefineDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM
 
 							//add new language name in langMenu
 							HWND hNpp = ::GetParent(_hSelf);
+							if (needMenuSeparator)
+							{
+								::InsertMenu(::GetSubMenu((HMENU)::SendMessage(hNpp, NPPM_INTERNAL_GETMENU, 0, 0), MENUINDEX_LANGUAGE), IDM_LANG_USER, MF_BYPOSITION|MF_SEPARATOR, 0, TEXT(""));
+							}
+
 							::InsertMenu(::GetSubMenu((HMENU)::SendMessage(hNpp, NPPM_INTERNAL_GETMENU, 0, 0), MENUINDEX_LANGUAGE), IDM_LANG_USER + newIndex /*+ 1*/, MF_BYCOMMAND, IDM_LANG_USER + newIndex + 1, newName);
 							::DrawMenuBar(hNpp);
 						}