[Winmerge-svn] SF.net SVN: winmerge: [5150] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <sdo...@us...> - 2008-03-17 20:31:39
|
Revision: 5150 http://winmerge.svn.sourceforge.net/winmerge/?rev=5150&view=rev Author: sdottaka Date: 2008-03-17 13:31:27 -0700 (Mon, 17 Mar 2008) Log Message: ----------- BUG: [ 1915424 ] The filter box in Open-dialog sometimes displays garbage Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/ShellExtension/WinMergeShell.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-03-15 09:47:47 UTC (rev 5149) +++ trunk/Docs/Users/ChangeLog.txt 2008-03-17 20:31:27 UTC (rev 5150) @@ -4,6 +4,8 @@ WinMerge 2.9.0.1 BugFix: Installer could create a registry access error (#1909967) + BugFix: The filter text box in Open-dialog sometimes displayed some garbage + data (#1915424) Translation updates: - German (r5130, r5139) - Russian (#1914466) Modified: trunk/ShellExtension/WinMergeShell.cpp =================================================================== --- trunk/ShellExtension/WinMergeShell.cpp 2008-03-15 09:47:47 UTC (rev 5149) +++ trunk/ShellExtension/WinMergeShell.cpp 2008-03-17 20:31:27 UTC (rev 5150) @@ -457,6 +457,10 @@ UINT uidFirstCmd) { String strMenu = GetResourceString(IDS_CONTEXT_MENU); + + InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); + uMenuIndex++; + InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd, strMenu.c_str()); // Add bitmap @@ -466,8 +470,11 @@ // Show menu item as grayed if more than two items selected if (m_nSelectedItems > MaxFileCount) EnableMenuItem(hmenu, uMenuIndex, MF_BYPOSITION | MF_GRAYED); + + uMenuIndex++; + InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); - return 1; + return 2; } /// Create menu for advanced mode @@ -479,7 +486,10 @@ String strCompareTo = GetResourceString(IDS_COMPARE_TO); String strReselect = GetResourceString(IDS_RESELECT_FIRST); int nItemsAdded = 0; - + + InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); + uMenuIndex++; + switch (m_dwMenuState) { // No items selected earlier @@ -537,6 +547,9 @@ EnableMenuItem(hmenu, uMenuIndex, MF_BYPOSITION | MF_GRAYED); } + uMenuIndex++; + InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); + return nItemsAdded; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |