[Winmerge-svn] SF.net SVN: winmerge: [4971] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2008-01-28 22:08:46
|
Revision: 4971 http://winmerge.svn.sourceforge.net/winmerge/?rev=4971&view=rev Author: gerundt Date: 2008-01-28 14:08:43 -0800 (Mon, 28 Jan 2008) Log Message: ----------- PATCH: [ 1869755 ] Use radio symbol for current EOL menu item Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MergeEditView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-01-28 20:07:15 UTC (rev 4970) +++ trunk/Docs/Users/ChangeLog.txt 2008-01-28 22:08:43 UTC (rev 4971) @@ -6,6 +6,7 @@ Detect (and read/write) UTF-8 files without BOM (#1879271) Tell user that file is not a conflict file (#1880423) Allow opening conflict file from command line (#1880857) + Use radio symbol for current EOL menu item (#1869755) BugFix: Always return 0 to command line (#1854419) Translation updates: - Croatian (r4952) Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2008-01-28 20:07:15 UTC (rev 4970) +++ trunk/Src/MergeEditView.cpp 2008-01-28 22:08:43 UTC (rev 4971) @@ -2117,10 +2117,10 @@ if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) || nStyle != m_pTextBuffer->GetCRLFMode()) { - pCmdUI->Enable(TRUE); + pCmdUI->SetRadio(FALSE); } else - pCmdUI->Enable(FALSE); + pCmdUI->SetRadio(TRUE); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |