Menu
▾
▴
[Anyedit-cvs]AnyEditv2 AnyEdit.cpp,1.28,1.29 AnyEdit.h,1.24,1.25 AnyEdit.rc,1.25,1.26 AnyEditView.cpp,1.30,1.31 AnyEditView.h,1.16,1.17 MainFrm.cpp,1.26,1.27 MainFrm.h,1.19,1.20 WorkspaceBar.cpp,1.20,1.21 WorkspaceBar.h,1.16,1.17
Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1:/tmp/cvs-serv6422
Modified Files:
AnyEdit.cpp AnyEdit.h AnyEdit.rc AnyEditView.cpp AnyEditView.h
MainFrm.cpp MainFrm.h WorkspaceBar.cpp WorkspaceBar.h
Log Message:
Merged bug fixes sent by Mario
Index: AnyEdit.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** AnyEdit.cpp 23 Jul 2003 09:41:34 -0000 1.28
--- AnyEdit.cpp 11 Aug 2003 04:03:19 -0000 1.29
***************
*** 111,116 ****
--- 111,118 ----
//Dump handler deepwashere uncomment later!
+ #ifndef DEBUG
if(!CDumpHandleApp::InitInstance())
return FALSE;
+ #endif
AfxEnableControlContainer();
***************
*** 558,563 ****
}
! CAnyEditView *pView = (CAnyEditView *) pChild->GetActiveView();
! pView->SetSelectedLine(i); //deepwashere
}
--- 560,570 ----
}
! CView * view = pChild->GetActiveView();
!
! if(view->IsKindOf(RUNTIME_CLASS(CAnyEditView)))
! {
! CAnyEditView *pView = (CAnyEditView *) view;
! pView->SetSelectedLine(i); //deepwashere
! }
}
***************
*** 1464,1465 ****
--- 1471,1477 ----
}
+
+ void CAnyEditApp::ClearClassView()
+ {
+ ((CMainFrame*)m_pMainWnd)->ClearClassView();
+ }
Index: AnyEdit.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** AnyEdit.h 23 Jul 2003 09:41:34 -0000 1.24
--- AnyEdit.h 11 Aug 2003 04:03:19 -0000 1.25
***************
*** 141,144 ****
--- 141,145 ----
public:
+ void ClearClassView();
CComboBox * findbox;
CComboBox * funcbox;
Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** AnyEdit.rc 31 Jul 2003 08:57:48 -0000 1.25
--- AnyEdit.rc 11 Aug 2003 04:03:19 -0000 1.26
***************
*** 1661,1666 ****
COMBOBOX IDC_COMBO3,66,23,114,46,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_COMBO2,66,39,114,46,CBS_DROPDOWN | CBS_SORT |
! WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "",IDC_BUTTON1,181,7,12,12
CONTROL "&Match whole word only",IDC_CHECK1,"Button",
--- 1661,1666 ----
COMBOBOX IDC_COMBO3,66,23,114,46,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
! COMBOBOX IDC_COMBO2,66,39,114,46,CBS_DROPDOWN | CBS_AUTOHSCROLL |
! CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "",IDC_BUTTON1,181,7,12,12
CONTROL "&Match whole word only",IDC_CHECK1,"Button",
Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** AnyEditView.cpp 17 Jul 2003 11:32:15 -0000 1.30
--- AnyEditView.cpp 11 Aug 2003 04:03:19 -0000 1.31
***************
*** 107,110 ****
--- 107,111 ----
ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnConfigureCurrentdocumentFoldmargin)
ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnUpdateConfigureCurrentdocumentFoldmargin)
+ ON_WM_DESTROY()
//}}AFX_MSG_MAP
ON_WM_CONTEXTMENU()
***************
*** 1986,1987 ****
--- 1987,2010 ----
}
+
+ void CAnyEditView::OnDestroy()
+ {
+ CView::OnDestroy();
+ CDocument* pDoc=GetDocument();
+ if ( (pDoc!=NULL) && (pDoc->IsKindOf(RUNTIME_CLASS(CAnyEditDoc))) )
+ {
+ int rev = CurDocPath.ReverseFind('\\');
+ if(rev==-1)
+ return;
+ CString docpath = theApp.GetAppPath();//CurDocPath.Left(rev);
+ docpath += "temp\\";
+ CString filnam ;//= "temp\\";
+ filnam+= CurDocPath.Right(CurDocPath.GetLength()-rev-1);
+ BOOL parseForProject=true;
+ if (!theApp.IsFileInCurrentProject(CurDocPath))
+ {
+ theApp.ClearClassView();
+ }
+
+ };
+ }
Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AnyEditView.h 9 Jul 2003 07:17:55 -0000 1.16
--- AnyEditView.h 11 Aug 2003 04:03:19 -0000 1.17
***************
*** 170,173 ****
--- 170,174 ----
afx_msg void OnConfigureCurrentdocumentFoldmargin();
afx_msg void OnUpdateConfigureCurrentdocumentFoldmargin(CCmdUI* pCmdUI);
+ afx_msg void OnDestroy();
//}}AFX_MSG
afx_msg void OnEditFind();
Index: MainFrm.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** MainFrm.cpp 31 Jul 2003 08:57:48 -0000 1.26
--- MainFrm.cpp 11 Aug 2003 04:03:19 -0000 1.27
***************
*** 1534,1535 ****
--- 1534,1540 ----
}
+
+ void CMainFrame::ClearClassView()
+ {
+ m_wndWorkSpace.ClearClassView();
+ }
Index: MainFrm.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MainFrm.h 23 Jul 2003 09:41:34 -0000 1.19
--- MainFrm.h 11 Aug 2003 04:03:19 -0000 1.20
***************
*** 61,64 ****
--- 61,65 ----
// Implementation
public:
+ void ClearClassView();
CTagList * GetCurrentTagList();
void GetTagsNearest(LPCSTR word, CStringArray &arr);
Index: WorkspaceBar.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/WorkspaceBar.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** WorkspaceBar.cpp 8 May 2003 12:00:56 -0000 1.20
--- WorkspaceBar.cpp 11 Aug 2003 04:03:19 -0000 1.21
***************
*** 509,510 ****
--- 509,523 ----
m_wndClassView.UnlockTagList();
}
+
+ void CWorkspaceBar::ClearClassView()
+ {
+ if(LockTagList())
+ {
+ m_sharedTagList.ClearAllContents();
+ m_wndClassView.FillTagList(&m_sharedTagList);
+ UnlockTagList();
+ }
+ //clean up of temporary files
+ for(int i=0;i<m_ParserTemporaryFile.GetSize();i++)
+ remove(m_ParserTemporaryFile.GetAt(i));
+ }
Index: WorkspaceBar.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/WorkspaceBar.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** WorkspaceBar.h 8 May 2003 12:00:56 -0000 1.16
--- WorkspaceBar.h 11 Aug 2003 04:03:19 -0000 1.17
***************
*** 81,84 ****
--- 81,85 ----
// Implementation
public:
+ void ClearClassView();
CTagList * GetCurrentTagList();
void GetTagsNearest(LPCSTR word,CStringArray &arr);
|
