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

[<sdo...@us...>]

Revision: 3695
          http://svn.sourceforge.net/winmerge/?rev=3695&view=rev
Author:   sdottaka
Date:     2006-10-09 15:55:15 -0700 (Mon, 09 Oct 2006)

Log Message:
-----------
BUG: [ 1570259 ] Bookmarks GUI get reset after save

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

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-10-09 22:46:15 UTC (rev 3694)
+++ branches/R2_6/Src/Changes.txt	2006-10-09 22:55:15 UTC (rev 3695)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-10-09 Takashi
+ BUG: [ 1570259 ] Bookmarks GUI get reset after save
+  Src/editlib: ccrystaltextview.cpp
+
 2006-10-08 Takashi
  To fix the bug "BUG: [ 1570173 ] Crash when merging all differences",
  revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect"

Modified: branches/R2_6/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.cpp	2006-10-09 22:46:15 UTC (rev 3694)
+++ branches/R2_6/Src/editlib/ccrystaltextview.cpp	2006-10-09 22:55:15 UTC (rev 3695)
@@ -487,6 +487,7 @@
   m_bWordWrap = FALSE;
   m_bDragSelection = FALSE;
   m_bLastSearch = FALSE;
+  m_bBookmarkExist = FALSE;
   //BEGIN SW
   m_panSubLines = new CArray<int, int>();
   ASSERT( m_panSubLines );
@@ -1968,8 +1969,6 @@
   m_bPrintHeader = FALSE;
   m_bPrintFooter = TRUE;
 
-  m_bBookmarkExist = FALSE;     // More bookmarks
-
   m_bMultipleSearch = FALSE;    // More search
 
 }


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