Menu
▾
▴
[Anyedit-cvs]AnyEditv2 AnyEditView.cpp,1.31,1.32 AnyEditView.h,1.17,1.18 BugReport.cpp,1.3,1.4 ChangeLog.txt,1.27,1.28 FindDialog.cpp,1.9,1.10 FindReplace.cpp,1.4,1.5 Language.cpp,1.8,1.9
Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1:/tmp/cvs-serv6649
Modified Files:
AnyEditView.cpp AnyEditView.h BugReport.cpp ChangeLog.txt
FindDialog.cpp FindReplace.cpp Language.cpp
Log Message:
26) Fixed regular expression not working with find and find replace [#787886]
27) Added folding support to html files
Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** AnyEditView.cpp 11 Aug 2003 04:03:19 -0000 1.31
--- AnyEditView.cpp 27 Aug 2003 06:32:42 -0000 1.32
***************
*** 108,117 ****
ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnUpdateConfigureCurrentdocumentFoldmargin)
ON_WM_DESTROY()
//}}AFX_MSG_MAP
ON_WM_CONTEXTMENU()
// Standard printing commands
! ON_COMMAND(ID_FILE_PRINT, CView::OnFilePrint)
! ON_COMMAND(ID_FILE_PRINT_DIRECT, CView::OnFilePrint)
! ON_COMMAND(ID_FILE_PRINT_PREVIEW, CView::OnFilePrintPreview)
ON_COMMAND(ID_EDIT_FIND_COMBO, OnEditFind)
ON_COMMAND(ID_EDIT_NEXT_TAG, OnComboFunction)
--- 108,118 ----
ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnUpdateConfigureCurrentdocumentFoldmargin)
ON_WM_DESTROY()
+ ON_COMMAND(ID_FILE_PRINT_PREVIEW, OnFilePrintPreview)
//}}AFX_MSG_MAP
ON_WM_CONTEXTMENU()
// Standard printing commands
! //ON_COMMAND(ID_FILE_PRINT, CView::OnFilePrint)
! //ON_COMMAND(ID_FILE_PRINT_DIRECT, CView::OnFilePrint)
! //ON_COMMAND(ID_FILE_PRINT_PREVIEW, CView::OnFilePrintPreview)
ON_COMMAND(ID_EDIT_FIND_COMBO, OnEditFind)
ON_COMMAND(ID_EDIT_NEXT_TAG, OnComboFunction)
***************
*** 2008,2010 ****
--- 2009,2028 ----
};
+ }
+
+ void CAnyEditView::OnPrint(CDC* pDC, CPrintInfo* pInfo)
+ {
+ // TODO: Add your specialized code here and/or call the base class
+ //m_Scintilla.PrintClient(pDC,PRF_OWNED);
+ //CView::OnPrint(pDC, pInfo);
+ /*RangeToFormat frPrint;
+ frPrint.hdc = pDC;
+ frPrint.hdcTarget=pDC;
+ m_Scintilla.FormatRange(true,(long)&frPrint);*/
+ }
+
+ void CAnyEditView::OnFilePrintPreview()
+ {
+ // TODO: Add your command handler code here
+ BCGPrintPreview(this);
}
Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AnyEditView.h 11 Aug 2003 04:03:19 -0000 1.17
--- AnyEditView.h 27 Aug 2003 06:32:42 -0000 1.18
***************
*** 50,59 ****
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CAnyEditView)
! public:
virtual void OnDraw(CDC* pDC); // overridden to draw this view
virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
virtual void OnInitialUpdate();
! protected:
virtual BOOL OnPreparePrinting(CPrintInfo* pInfo);
virtual void OnBeginPrinting(CDC* pDC, CPrintInfo* pInfo);
--- 50,59 ----
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CAnyEditView)
! public:
virtual void OnDraw(CDC* pDC); // overridden to draw this view
virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
virtual void OnInitialUpdate();
! protected:
virtual BOOL OnPreparePrinting(CPrintInfo* pInfo);
virtual void OnBeginPrinting(CDC* pDC, CPrintInfo* pInfo);
***************
*** 61,65 ****
virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
! //}}AFX_VIRTUAL
// Implementation
--- 61,66 ----
virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
! virtual void OnPrint(CDC* pDC, CPrintInfo* pInfo);
! //}}AFX_VIRTUAL
// Implementation
***************
*** 171,174 ****
--- 172,176 ----
afx_msg void OnUpdateConfigureCurrentdocumentFoldmargin(CCmdUI* pCmdUI);
afx_msg void OnDestroy();
+ afx_msg void OnFilePrintPreview();
//}}AFX_MSG
afx_msg void OnEditFind();
Index: BugReport.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/BugReport.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BugReport.cpp 8 May 2003 12:00:56 -0000 1.3
--- BugReport.cpp 27 Aug 2003 06:32:42 -0000 1.4
***************
*** 130,135 ****
retStr += _T( "Microsoft Windows NT ");
! if ( osvi.dwMajorVersion == 5 )
retStr += _T("Microsoft Windows 2000 ");
// Test for workstation versus server.
--- 130,138 ----
retStr += _T( "Microsoft Windows NT ");
! if ( (osvi.dwMajorVersion == 5) && (osvi.dwMinorVersion==0))
retStr += _T("Microsoft Windows 2000 ");
+
+ if ( (osvi.dwMajorVersion == 5) && (osvi.dwMinorVersion>=1))
+ retStr += _T("Microsoft Windows XP ");
// Test for workstation versus server.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ChangeLog.txt 18 Jul 2003 19:05:36 -0000 1.27
--- ChangeLog.txt 27 Aug 2003 06:32:42 -0000 1.28
***************
*** 31,34 ****
--- 31,36 ----
24) Added Initial Plugin support
25) Added Diff Plugin
+ 26) Fixed regular expression not working with find and find replace [#787886]
+ 27) Added folding support to html files
Beta 1.0
Index: FindDialog.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FindDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FindDialog.cpp 7 Aug 2003 06:48:09 -0000 1.9
--- FindDialog.cpp 27 Aug 2003 06:32:42 -0000 1.10
***************
*** 80,84 ****
if(m_check2.GetCheck())
flags = flags | SCFIND_MATCHCASE;
! if(m_check2.GetCheck())
flags = flags | SCFIND_REGEXP;
--- 80,84 ----
if(m_check2.GetCheck())
flags = flags | SCFIND_MATCHCASE;
! if(m_check3.GetCheck())
flags = flags | SCFIND_REGEXP;
Index: FindReplace.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FindReplace.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FindReplace.cpp 17 Jul 2003 11:32:15 -0000 1.4
--- FindReplace.cpp 27 Aug 2003 06:32:42 -0000 1.5
***************
*** 79,83 ****
if(m_check2.GetCheck())
flags = flags | SCFIND_MATCHCASE;
! if(m_check2.GetCheck())
flags = flags | SCFIND_REGEXP;
--- 79,83 ----
if(m_check2.GetCheck())
flags = flags | SCFIND_MATCHCASE;
! if(m_check3.GetCheck())
flags = flags | SCFIND_REGEXP;
Index: Language.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/Language.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Language.cpp 8 May 2003 12:00:56 -0000 1.8
--- Language.cpp 27 Aug 2003 06:32:42 -0000 1.9
***************
*** 197,201 ****
--- 197,204 ----
if((lexer == SCLEX_HTML) || (lexer == SCLEX_XML) ||
(lexer == SCLEX_ASP) || (lexer == SCLEX_PHP) )
+ {
m_scintilla->SetStyleBits(7);
+ m_scintilla->SetProperty("fold.html","1");
+ }
else
m_scintilla->SetStyleBits(5);
***************
*** 205,209 ****
void CLanguage::SetListWords(CString str)
{
- //msc.ReturnDelimitedArray(str," ",listwords);
listwords = str;
}
--- 208,211 ----
***************
*** 212,218 ****
void CLanguage::GetListWords(CString &lwords)
{
- //AfxMessageBox(listwords);
- //CString tstr = listwords;
- //msc.ReturnDelimitedArray(tstr," ",lwords);
lwords = listwords;
}
--- 214,217 ----
|
