[Winmerge-svn] SF.net SVN: winmerge: [3938] trunk/Src

[<ga...@us...>]

Revision: 3938
          http://svn.sourceforge.net/winmerge/?rev=3938&view=rev
Author:   galh
Date:     2006-12-10 06:36:06 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
BUG: [ 1611542 ] "Wrap lines" does not work for diff pane

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/MergeDiffDetailView.cpp
    trunk/Src/MergeDiffDetailView.h

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-12-10 14:33:16 UTC (rev 3937)
+++ trunk/Src/Changes.txt	2006-12-10 14:36:06 UTC (rev 3938)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-12-10 Gal
+ BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
+  Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
+
 2006-12-10 Takashi
  PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
   Src new files: MergeDocDiffSync.cpp

Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp	2006-12-10 14:33:16 UTC (rev 3937)
+++ trunk/Src/MergeDiffDetailView.cpp	2006-12-10 14:36:06 UTC (rev 3938)
@@ -70,6 +70,7 @@
 	ON_UPDATE_COMMAND_UI(ID_L2R, OnUpdateL2r)
 	ON_COMMAND(ID_R2L, OnR2l)
 	ON_UPDATE_COMMAND_UI(ID_R2L, OnUpdateR2l)
+	ON_UPDATE_COMMAND_UI(ID_VIEW_WORDWRAP, OnUpdateViewWordWrap)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -801,3 +802,9 @@
 			GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
 	SetWordWrapping(FALSE);
 }
+
+void CMergeDiffDetailView::OnUpdateViewWordWrap(CCmdUI *pCmdUI)
+{
+	pCmdUI->Enable(FALSE);
+	pCmdUI->SetCheck(m_bWordWrap);
+}

Modified: trunk/Src/MergeDiffDetailView.h
===================================================================
--- trunk/Src/MergeDiffDetailView.h	2006-12-10 14:33:16 UTC (rev 3937)
+++ trunk/Src/MergeDiffDetailView.h	2006-12-10 14:36:06 UTC (rev 3938)
@@ -136,6 +136,7 @@
 	afx_msg void OnUpdateL2r(CCmdUI* pCmdUI);
 	afx_msg void OnR2l();
 	afx_msg void OnUpdateR2l(CCmdUI* pCmdUI);
+	afx_msg void OnUpdateViewWordWrap(CCmdUI *pCmdUI);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.