[GME-commit]
GMESRC/GME/GMEActiveBrowser AggregateTreeCtrl.cpp,1.17,1.18
MgaMappedTreeCtrl.h,1.2,1.3 MgaMappedTreeCtrl.cpp,1.5,1.6
InheritanceTreeCtrl.cpp,1.1,1.2GMEActiveBrowserDropTarget.h,1.2,1.3
GMEActiveBrowserDropTarget.cpp,1.4,1.5 MetaTreeCtrl.cpp,1.2,1.3
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Tue Jun 29 13:49:14 CDT 2004
Update of /var/lib/gme/GMESRC/GME/GMEActiveBrowser
In directory braindrain:/tmp/cvs-serv17889/GME/GMEActiveBrowser
Modified Files:
AggregateTreeCtrl.cpp MgaMappedTreeCtrl.h
MgaMappedTreeCtrl.cpp InheritanceTreeCtrl.cpp
GMEActiveBrowserDropTarget.h GMEActiveBrowserDropTarget.cpp
MetaTreeCtrl.cpp
Log Message:
Added Event logging to ActiveBrowser
CVS User: brianw
Index: AggregateTreeCtrl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AggregateTreeCtrl.cpp 2 Jun 2004 22:15:47 -0000 1.17
--- AggregateTreeCtrl.cpp 29 Jun 2004 17:49:10 -0000 1.18
***************
*** 33,36 ****
--- 33,37 ----
HTREEITEM CAggregateTreeCtrl::InsertItem(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType)
{
+ MGATREECTRL_LOGEVENT("CAggregateTreeCtrl::InsertItem "+strObjectName+"\r\n");
if(m_MgaMap.bIsInMap(pUnknown)) // Should not happen
***************
*** 118,121 ****
--- 119,123 ----
HTREEITEM CAggregateTreeCtrl::InsertItemUpdate(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType)
{
+ MGATREECTRL_LOGEVENT("CAggregateTreeCtrl::InsertItemUpdate "+strObjectName+"\r\n");
HTREEITEM hTreeItem;
***************
*** 732,735 ****
--- 734,738 ----
BOOL CAggregateTreeCtrl::DoDrop(eDragOperation doDragOp, COleDataObject *pDataObject, CPoint point)
{
+ MGATREECTRL_LOGEVENT("CAggregateTreeCtrl::DoDrop\r\n");
HTREEITEM hItem= GetSelectedItem();
Index: MgaMappedTreeCtrl.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/MgaMappedTreeCtrl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgaMappedTreeCtrl.h 30 May 2002 19:40:00 -0000 1.2
--- MgaMappedTreeCtrl.h 29 Jun 2004 17:49:11 -0000 1.3
***************
*** 14,18 ****
#include "GMEActiveBrowserDropTarget.h" // Added by ClassView
!
class CMgaMappedTreeCtrl : public CTreeCtrlEx
--- 14,25 ----
#include "GMEActiveBrowserDropTarget.h" // Added by ClassView
! #define MGATREECTRL_LOGEVENT(eventstring) \
! { \
! if(m_EventLogger != NULL) \
! { \
! CComBSTR eventBSTR = eventstring; \
! m_EventLogger->LogEvent(eventBSTR); \
! } \
! } \
class CMgaMappedTreeCtrl : public CTreeCtrlEx
***************
*** 35,38 ****
--- 42,47 ----
protected:
CGMEActiveBrowserDropTarget m_DropTarget;
+
+ CComPtr<IMgaEventLogger> m_EventLogger;
};
Index: MgaMappedTreeCtrl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/MgaMappedTreeCtrl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaMappedTreeCtrl.cpp 2 Jun 2004 22:15:47 -0000 1.5
--- MgaMappedTreeCtrl.cpp 29 Jun 2004 17:49:11 -0000 1.6
***************
*** 20,23 ****
--- 20,31 ----
{
+ try
+ {
+ COMTHROW( m_EventLogger.CoCreateInstance(L"Mga.MgaEventLogger"));
+ }
+ catch(...)
+ {
+ m_EventLogger = NULL;
+ }
}
Index: InheritanceTreeCtrl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/InheritanceTreeCtrl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InheritanceTreeCtrl.cpp 1 Mar 2002 21:53:00 -0000 1.1
--- InheritanceTreeCtrl.cpp 29 Jun 2004 17:49:11 -0000 1.2
***************
*** 29,32 ****
--- 29,33 ----
HTREEITEM CInheritanceTreeCtrl::InsertItem(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType)
{
+ MGATREECTRL_LOGEVENT("CInheritanceTreeCtrl::InsertItem "+strObjectName+"\r\n");
if(m_MgaMap.bIsInMap(pUnknown)) // Should not happen
Index: GMEActiveBrowserDropTarget.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowserDropTarget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GMEActiveBrowserDropTarget.h 7 Feb 2003 15:11:23 -0000 1.2
--- GMEActiveBrowserDropTarget.h 29 Jun 2004 17:49:11 -0000 1.3
***************
*** 11,14 ****
--- 11,23 ----
#endif // _MSC_VER > 1000
+ #define ACTIVEBROWSERDROPTARGET_LOGEVENT(eventstring) \
+ { \
+ if(m_EventLogger != NULL) \
+ { \
+ CComBSTR eventBSTR = eventstring; \
+ m_EventLogger->LogEvent(eventBSTR); \
+ } \
+ } \
+
class CMgaMappedTreeCtrl;
***************
*** 28,31 ****
--- 37,41 ----
virtual ~CGMEActiveBrowserDropTarget();
CMgaMappedTreeCtrl* m_pParent;
+ CComPtr<IMgaEventLogger> m_EventLogger;
};
Index: GMEActiveBrowserDropTarget.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowserDropTarget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GMEActiveBrowserDropTarget.cpp 2 Jun 2004 22:15:47 -0000 1.4
--- GMEActiveBrowserDropTarget.cpp 29 Jun 2004 17:49:11 -0000 1.5
***************
*** 26,29 ****
--- 26,38 ----
m_bCreatedDragImageList=FALSE;
m_pDragImageList=NULL;
+
+ try
+ {
+ COMTHROW( m_EventLogger.CoCreateInstance(L"Mga.MgaEventLogger"));
+ }
+ catch(...)
+ {
+ m_EventLogger = NULL;
+ }
}
***************
*** 35,38 ****
--- 44,48 ----
DROPEFFECT CGMEActiveBrowserDropTarget::OnDragEnter(CWnd *pWnd, COleDataObject *pDataObject, DWORD dwKeyState, CPoint point)
{
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragEnter()\r\n");
m_pDragImageList=NULL;
***************
*** 41,44 ****
--- 51,55 ----
if(m_pParent->m_CurrentDragImage.GetSafeHandle()!=NULL) // Drag initiated by the tree control
{
+ ACTIVEBROWSERDROPTARGET_LOGEVENT(" Drag initiated by the tree control\r\n");
m_pDragImageList=&m_pParent->m_CurrentDragImage;
m_ptHotSpot=m_pParent->m_ptHotSpot;
***************
*** 93,96 ****
--- 104,108 ----
if(!m_pParent->IsRelevantDropTarget(point,m_pDragImageList))
{
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_NONE\r\n");
return DROPEFFECT_NONE;
}
***************
*** 102,107 ****
--- 114,121 ----
if (CGMEDataSource::IsXMLDataAvailable(pDataObject)) {
m_doDragOperation=DRAGOP_COPY;
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_COPY\r\n");
return DROPEFFECT_COPY;
}
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_NONE\r\n");
return DROPEFFECT_NONE;
}
***************
*** 124,127 ****
--- 138,142 ----
{
deRetVal=DROPEFFECT_LINK;
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_LINK\r\n");
m_doDragOperation=DRAGOP_REFERENCE;
}
***************
*** 129,132 ****
--- 144,148 ----
{
deRetVal=DROPEFFECT_COPY | DROPEFFECT_LINK;
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_COPY | DROPEFFECT_LINK\r\n");
m_doDragOperation=DRAGOP_SUBTYPE;
}
***************
*** 134,137 ****
--- 150,154 ----
{
deRetVal=DROPEFFECT_COPY;
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_COPY\r\n");
m_doDragOperation=DRAGOP_COPY;
}
***************
*** 139,142 ****
--- 156,160 ----
{
deRetVal=DROPEFFECT_COPY | DROPEFFECT_LINK;
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_COPY | DROPEFFECT_LINK\r\n");
m_doDragOperation=DRAGOP_INSTANCE;
}
***************
*** 144,147 ****
--- 162,166 ----
{
deRetVal=DROPEFFECT_MOVE;
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragOver DROPEFFECT_MOVE\r\n");
m_doDragOperation=DRAGOP_MOVE;
}
***************
*** 152,155 ****
--- 171,175 ----
void CGMEActiveBrowserDropTarget::OnDragLeave(CWnd *pWnd)
{
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDragLeave()\r\n");
if(m_pDragImageList!=NULL)
{
***************
*** 172,175 ****
--- 192,196 ----
BOOL CGMEActiveBrowserDropTarget::OnDrop(CWnd *pWnd, COleDataObject *pDataObject, DROPEFFECT, CPoint point)
{
+ ACTIVEBROWSERDROPTARGET_LOGEVENT("CGMEActiveBrowserDropTarget::OnDrop()\r\n");
OnDragLeave(pWnd);
Index: MetaTreeCtrl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/MetaTreeCtrl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MetaTreeCtrl.cpp 3 Mar 2002 20:27:00 -0000 1.2
--- MetaTreeCtrl.cpp 29 Jun 2004 17:49:11 -0000 1.3
***************
*** 30,33 ****
--- 30,34 ----
HTREEITEM CMetaTreeCtrl::InsertItem(HTREEITEM hParent, CString strObjectName, LPUNKNOWN pUnknown, objtype_enum otObjectType)
{
+ MGATREECTRL_LOGEVENT("CMetaTreeCtrl::InsertItem "+strObjectName+"\r\n");
if(hParent==NULL) // Root folder
More information about the GME-commit
mailing list