[Winmerge-svn] SF.net SVN: winmerge: [4545] branches/R2_6/Src

[<ki...@us...>]

Revision: 4545
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4545&view=rev
Author:   kimmov
Date:     2007-09-15 04:17:48 -0700 (Sat, 15 Sep 2007)

Log Message:
-----------
BUG: [ 1776487 ] REPLACE dialog, copy highlighted text to FIND fileld

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/editlib/ccrystaleditview.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-09-15 11:16:37 UTC (rev 4544)
+++ branches/R2_6/Src/Changes.txt	2007-09-15 11:17:48 UTC (rev 4545)
@@ -7,6 +7,8 @@
   Src: MergeEditView.cpp MergeEditView.h
  BUG: [ 1787816 ] Bug in File Rename
   Src: DirActions.cpp
+ BUG: [ 1776487 ] REPLACE dialog, copy highlighted text to FIND fileld
+  Src/editlib: ccrystaleditview.cpp
 
 2007-08-22 Tim
  PATCH: [ 1743623 ] ChineseSimplified language .rc file for trunk rev.4317

Modified: branches/R2_6/Src/editlib/ccrystaleditview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaleditview.cpp	2007-09-15 11:16:37 UTC (rev 4544)
+++ branches/R2_6/Src/editlib/ccrystaleditview.cpp	2007-09-15 11:17:48 UTC (rev 4545)
@@ -1301,6 +1301,10 @@
       dlg.m_bEnableScopeSelection = TRUE;
       dlg.m_ptBlockBegin = m_ptSavedSelStart;
       dlg.m_ptBlockEnd = m_ptSavedSelEnd;
+
+      // If the selection is in one line, copy text to dialog
+      if (m_ptSavedSelStart.y == m_ptSavedSelEnd.y)
+        GetText(m_ptSavedSelStart, m_ptSavedSelEnd, dlg.m_sText);
     }
   else
     {
@@ -1308,7 +1312,9 @@
       dlg.m_ptCurrentPos = GetCursorPos ();
       dlg.m_bEnableScopeSelection = FALSE;
 
-      CPoint ptCursorPos = GetCursorPos (), ptStart = WordToLeft (ptCursorPos), ptEnd = WordToRight (ptCursorPos);
+      CPoint ptCursorPos = GetCursorPos ();
+      CPoint ptStart = WordToLeft (ptCursorPos);
+      CPoint ptEnd = WordToRight (ptCursorPos);
       if (IsValidTextPos (ptStart) && IsValidTextPos (ptEnd) && ptStart != ptEnd)
         GetText (ptStart, ptEnd, dlg.m_sText);
     }


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