[GME-commit] GMESRC/GME/GMEActiveBrowser AggregateTreeCtrl.cpp,1.19,1.20 AggregateTreeCtrl.h,1.4,1.5

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/GMEActiveBrowser
In directory braindrain:/tmp/cvs-serv733

Modified Files:
	AggregateTreeCtrl.cpp AggregateTreeCtrl.h 
Log Message:
no message

CVS User: bogyom

Index: AggregateTreeCtrl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AggregateTreeCtrl.cpp	27 Sep 2004 21:54:46 -0000	1.19
--- AggregateTreeCtrl.cpp	29 Oct 2004 16:12:58 -0000	1.20
***************
*** 59,62 ****
--- 59,64 ----
  	CAggregatePropertyPage* pParent=(CAggregatePropertyPage*)GetParent();
  
+     int sourceControlImageOffset = 0;
+ 
  	if(pParent->m_Options.m_bIsDynamicLoading)
  	{
***************
*** 66,69 ****
--- 68,72 ----
  			CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
  			tvInsert.item.cChildren=pParent->reqHasDisplayedChild(ccpMgaObject);
+             sourceControlImageOffset = pParent->GetSourceControlStateOffset(ccpMgaObject);
  		}
  		else
***************
*** 86,91 ****
  	else
  	{
! 		tvInsert.item.iImage=(int)otObjectType;
! 		tvInsert.item.iSelectedImage=(int)otObjectType;
  	}
  
--- 89,94 ----
  	else
  	{
! 		tvInsert.item.iImage=(int)otObjectType+sourceControlImageOffset;
! 		tvInsert.item.iSelectedImage=(int)otObjectType+sourceControlImageOffset;
  	}
  
***************
*** 97,102 ****
  			tvInsert.item.iSelectedImage=10;
  		}
- 			
- 
  	}
  
--- 100,103 ----
***************
*** 139,142 ****
--- 140,145 ----
  	CAggregatePropertyPage* pParent=(CAggregatePropertyPage*)GetParent();
  
+     int sourceControlImageOffset = 0;
+ 
  	if(pParent->m_Options.m_bIsDynamicLoading)
  	{
***************
*** 146,149 ****
--- 149,153 ----
  			CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
  			tvInsert.item.cChildren=pParent->reqHasDisplayedChild(ccpMgaObject);
+             sourceControlImageOffset = pParent->GetSourceControlStateOffset(ccpMgaObject);
  		}
  		else
***************
*** 166,171 ****
  	else
  	{
! 		tvInsert.item.iImage=(int)otObjectType;
! 		tvInsert.item.iSelectedImage=(int)otObjectType;
  	}
  
--- 170,175 ----
  	else
  	{
! 		tvInsert.item.iImage=(int)otObjectType+sourceControlImageOffset;
! 		tvInsert.item.iSelectedImage=(int)otObjectType+sourceControlImageOffset;
  	}
  

Index: AggregateTreeCtrl.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/AggregateTreeCtrl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AggregateTreeCtrl.h	3 Jun 2002 23:50:00 -0000	1.4
--- AggregateTreeCtrl.h	29 Oct 2004 16:12:58 -0000	1.5
***************
*** 24,27 ****
--- 24,28 ----
  	BOOL IsLibrary(LPUNKNOWN pUnknown);
  
+     
  	void SetItemProperties(HTREEITEM hItem);
  	BOOL DoDrop(eDragOperation doDragOp, COleDataObject *pDataObject, CPoint point);