Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4076
Modified Files:
AnyEditView.cpp AnyEditView.h
Log Message:
Fix: Removed OnEditClear, see #1059335
Fix: Reset highlight guide when no brace is found
Fix: InsertStringArray recognize EOL mode of current text
Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** AnyEditView.h 26 Sep 2004 13:36:23 -0000 1.49
--- AnyEditView.h 8 May 2005 10:58:48 -0000 1.50
***************
*** 227,231 ****
afx_msg void OnSearchFindnextword();
afx_msg void OnSearchFindprevword();
- afx_msg void OnEditClear();
afx_msg void OnUpdateLineCol(CCmdUI* pCmdUI);
afx_msg void OnUpdateFType(CCmdUI* pCmdUI);
--- 227,230 ----
Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** AnyEditView.cpp 17 Apr 2005 12:30:09 -0000 1.90
--- AnyEditView.cpp 8 May 2005 10:58:48 -0000 1.91
***************
*** 173,177 ****
ON_COMMAND(ID_SEARCH_FINDNEXTWORD, OnSearchFindnextword)
ON_COMMAND(ID_SEARCH_FINDPREVWORD, OnSearchFindprevword)
- ON_COMMAND(ID_EDIT_CLEAR, OnEditClear)
ON_UPDATE_COMMAND_UI(ID_INDICATOR_LINECOL, OnUpdateLineCol)
ON_UPDATE_COMMAND_UI(ID_INDICATOR_FTYPE, OnUpdateFType)
--- 173,176 ----
***************
*** 494,498 ****
m_Scintilla.HighlightBraces(m_Scintilla.GetCurrentPos() - 1);
else
! m_Scintilla.BraceHighlight(-1, -1);
}
// We want to update the current function, so:
--- 493,501 ----
m_Scintilla.HighlightBraces(m_Scintilla.GetCurrentPos() - 1);
else
! {
! m_Scintilla.BraceHighlight(INVALID_POSITION, INVALID_POSITION);
! m_Scintilla.SetHighlightGuide(0);
! }
!
}
// We want to update the current function, so:
***************
*** 911,917 ****
}
void CAnyEditView::InsertStringArray(CStringArray &arr)
{
-
if(arr.GetSize()!=0)
if(arr.GetAt(arr.GetSize()-1).IsEmpty())
--- 914,920 ----
}
+ /// Inserts an array of text into current document
void CAnyEditView::InsertStringArray(CStringArray &arr)
{
if(arr.GetSize()!=0)
if(arr.GetAt(arr.GetSize()-1).IsEmpty())
***************
*** 920,924 ****
m_Scintilla.BeginUndoAction();
! if(m_Scintilla.GetSelectionStart()!=m_Scintilla.GetSelectionEnd())
{
m_Scintilla.Cut();
--- 923,927 ----
m_Scintilla.BeginUndoAction();
! if(m_Scintilla.IsSelection())
{
m_Scintilla.Cut();
***************
*** 956,965 ****
arrIns.InsertAt(0,arrLine);
str+= arrLine;
! str+= "\n";
if(i != x-1)
{
str+= strtoadd;
}
-
}
--- 959,967 ----
arrIns.InsertAt(0,arrLine);
str+= arrLine;
! str += m_Scintilla.GetEOLString();
if(i != x-1)
{
str+= strtoadd;
}
}
***************
*** 970,974 ****
m_Scintilla.InsertText(initial_pos,arrIns.GetAt(0));
final_pos = initial_pos + arrIns.GetAt(0).GetLength();
- m_Scintilla.SetSel(final_pos,final_pos);
}
else
--- 972,975 ----
***************
*** 976,981 ****
m_Scintilla.InsertText(initial_pos,str);
final_pos = initial_pos + str.GetLength();
- m_Scintilla.SetSel(final_pos,final_pos);
}
m_Scintilla.SetTargetStart(initial_pos);
--- 977,982 ----
m_Scintilla.InsertText(initial_pos,str);
final_pos = initial_pos + str.GetLength();
}
+ m_Scintilla.SetSel(final_pos,final_pos);
m_Scintilla.SetTargetStart(initial_pos);
***************
*** 985,991 ****
{
long stpos = m_Scintilla.GetTargetStart();
! long endpos = m_Scintilla.GetTargetEnd();
! m_Scintilla.SetSel(stpos,endpos);
! m_Scintilla.DeleteBack();
}
--- 986,991 ----
{
long stpos = m_Scintilla.GetTargetStart();
! m_Scintilla.ReplaceTarget(-1, "");
! m_Scintilla.SetSel(stpos, stpos);
}
***************
*** 2047,2056 ****
}
- /// Delete current char or selection. Works with rectangular selection too.
- void CAnyEditView::OnEditClear()
- {
- m_Scintilla.Clear();
- }
-
/// Show current line and column in statusbar
void CAnyEditView::OnUpdateLineCol(CCmdUI* pCmdUI) //@parm handle of textpane for linenumbers - see mainfrm.cpp at top
--- 2047,2050 ----
|
