[Anyedit-cvs]AnyEditv2/Plugins/Diff Diff.plg,1.2,1.3 DiffDlg.cpp,1.1,1.2 DiffDlg.h,1.1,1.2

[<td...@us...>]

Update of /cvsroot/anyedit/AnyEditv2/Plugins/Diff
In directory sc8-pr-cvs1:/tmp/cvs-serv28167/Plugins/Diff

Modified Files:
	Diff.plg DiffDlg.cpp DiffDlg.h 
Log Message:
FindReplace positions cursor after replaced text [#817192]
Diff plugin interface bug fixed [#817195]
Crash on lines > 2510 chars fixed [#799649]
Updated to scintilla 1.56
File copies in temp folder are now deleted [#798515]
Proper save of find and replace history done [#798521]
Standalone file leaves garbage in class view - Fixed [#730650]

Index: Diff.plg
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/Plugins/Diff/Diff.plg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Diff.plg	23 Jul 2003 09:41:35 -0000	1.2
--- Diff.plg	21 Nov 2003 13:53:00 -0000	1.3
***************
*** 7,49 ****
  </h3>
  <h3>Command Lines</h3>
- Creating command line "rc.exe /l 0x409 /fo"Release/Diff.res" /d "NDEBUG" /d "_AFXDLL" "C:\OS\AnyEditv2\Plugins\Diff\Diff.rc"" 
- Creating temporary file "C:\DOCUME~1\deep\LOCALS~1\Temp\RSP4EA.tmp" with contents
- [
- /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_AFXEXT" /Fp"Release/Diff.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
- "C:\OS\AnyEditv2\Plugins\Diff\DiffEngine.cpp"
- "C:\OS\AnyEditv2\Plugins\Diff\FilePartition.cpp"
- "C:\OS\AnyEditv2\Plugins\Diff\Diff.cpp"
- "C:\OS\AnyEditv2\Plugins\Diff\DiffDlg.cpp"
- ]
- Creating command line "cl.exe @C:\DOCUME~1\deep\LOCALS~1\Temp\RSP4EA.tmp" 
- Creating temporary file "C:\DOCUME~1\deep\LOCALS~1\Temp\RSP4EB.tmp" with contents
- [
- /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_AFXEXT" /Fp"Release/Diff.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
- "C:\OS\AnyEditv2\Plugins\Diff\StdAfx.cpp"
- ]
- Creating command line "cl.exe @C:\DOCUME~1\deep\LOCALS~1\Temp\RSP4EB.tmp" 
- Creating temporary file "C:\DOCUME~1\deep\LOCALS~1\Temp\RSP4EC.tmp" with contents
- [
- /nologo /subsystem:windows /dll /incremental:no /pdb:"Release/Diff.pdb" /machine:I386 /def:".\Diff.def" /out:"../../bin/Plugins/Diff.dll" /implib:"Release/Diff.lib" 
- .\Release\DiffEngine.obj
- .\Release\FilePartition.obj
- .\Release\Diff.obj
- .\Release\DiffDlg.obj
- .\Release\StdAfx.obj
- .\Release\Diff.res
- ]
- Creating command line "link.exe @C:\DOCUME~1\deep\LOCALS~1\Temp\RSP4EC.tmp"
- <h3>Output Window</h3>
- Compiling resources...
- Compiling...
- StdAfx.cpp
- Compiling...
- DiffEngine.cpp
- FilePartition.cpp
- Diff.cpp
- DiffDlg.cpp
- Generating Code...
- Linking...
-    Creating library Release/Diff.lib and object Release/Diff.exp
  
  
--- 7,10 ----

Index: DiffDlg.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/Plugins/Diff/DiffDlg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DiffDlg.cpp	18 Jul 2003 19:05:36 -0000	1.1
--- DiffDlg.cpp	21 Nov 2003 13:53:00 -0000	1.2
***************
*** 47,51 ****
  	//{{AFX_MSG_MAP(CDiffDlg)
  	ON_BN_CLICKED(ID_BUTTON1, OnButton1)
! 	ON_BN_CLICKED(65535, On65535)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
--- 47,51 ----
  	//{{AFX_MSG_MAP(CDiffDlg)
  	ON_BN_CLICKED(ID_BUTTON1, OnButton1)
! 	ON_BN_CLICKED(ID_BUTTON2, OnButton2)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 216,222 ****
  }
  
! void CDiffDlg::On65535() 
  {
! UpdateData(TRUE); // update the DDX variables
  
  	// show open file dialog, and let choose one or more files
--- 216,245 ----
  }
  
! void CDiffDlg::OnOK() 
  {
! 	UpdateData(TRUE); // update the DDX variables
! 
! 	CFileOptions o;
! 	if (!m_bCheckCase) o.SetOption( CString("case"), CString("no") );
! 	if (!m_bCheckIndent) o.SetOption( CString("indent"), CString("no") );
! 
! 	CString app_path = parent_plugin->GetAppPath();
! 	app_path+= "Temp\\Diff.html";
! 
! 	if(DoDiff(TRUE, m_szFile1, m_szFile2, app_path, o))
! 	{
! 		parent_plugin->OpenUrl(app_path);
! 		CDialog::OnOK();
! 	}
! }
! 
! void CDiffDlg::SetPlugin(CPlugin *plugin)
! {
! 	parent_plugin = plugin;
! }
! 
! void CDiffDlg::OnButton2() 
! {
! 	UpdateData(TRUE); // update the DDX variables
  
  	// show open file dialog, and let choose one or more files
***************
*** 243,268 ****
  
  	free( my_dialog.m_ofn.lpstrFile );
- }
- 
- void CDiffDlg::OnOK() 
- {
- 	UpdateData(TRUE); // update the DDX variables
- 
- 	CFileOptions o;
- 	if (!m_bCheckCase) o.SetOption( CString("case"), CString("no") );
- 	if (!m_bCheckIndent) o.SetOption( CString("indent"), CString("no") );
- 
- 	CString app_path = parent_plugin->GetAppPath();
- 	app_path+= "Temp\\Diff.html";
- 
- 	if(DoDiff(TRUE, m_szFile1, m_szFile2, app_path, o))
- 	{
- 		parent_plugin->OpenUrl(app_path);
- 		CDialog::OnOK();
- 	}
- }
- 
- void CDiffDlg::SetPlugin(CPlugin *plugin)
- {
- 	parent_plugin = plugin;
  }
--- 266,268 ----

Index: DiffDlg.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/Plugins/Diff/DiffDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DiffDlg.h	18 Jul 2003 19:05:36 -0000	1.1
--- DiffDlg.h	21 Nov 2003 13:53:00 -0000	1.2
***************
*** 42,47 ****
  	//{{AFX_MSG(CDiffDlg)
  	afx_msg void OnButton1();
- 	afx_msg void On65535();
  	virtual void OnOK();
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()
--- 42,47 ----
  	//{{AFX_MSG(CDiffDlg)
  	afx_msg void OnButton1();
  	virtual void OnOK();
+ 	afx_msg void OnButton2();
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()