[commit] r2009 - trunk/GME/GMEActiveBrowser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Aug 14 14:26:53 2012
New Revision: 2009

Log:
Cache treeIcon file-not-found. TreeIcon cleanup

Modified:
   trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp
   trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h

Modified: trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp	Tue Aug 14 13:35:30 2012	(r2008)
+++ trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp	Tue Aug 14 14:26:53 2012	(r2009)
@@ -1282,14 +1282,8 @@
 	if (treeIcon.length())
 	{
 		auto it = treeIcons.find(treeIcon);
-		if (it != treeIcons.end())
+		if (it != treeIcons.end() && it->second != 0)
 		{
-			auto expandedIt = treeIcons.end();
-			if (expandedTreeIcon.length() != 0)
-				expandedIt = treeIcons.find(expandedTreeIcon);
-			if (expandedIt == treeIcons.end())
-				expandedIt = it;
-
 			tvItem.iSelectedImage = tvItem.iImage = it->second;
 			return;
 		}
@@ -1331,7 +1325,12 @@
 		treeIcons.insert(std::make_pair(treeIcon, imageList->GetImageCount() - 2));
 		if (expandedTreeIcon.length() != 0)
 			treeIcons.insert(std::make_pair(treeIcon, imageList->GetImageCount()));
+	} 
+	else
+	{
+		treeIcons.insert(std::make_pair(treeIcon, 0));
 	}
+
 }
 
 

Modified: trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h
==============================================================================
--- trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h	Tue Aug 14 13:35:30 2012	(r2008)
+++ trunk/GME/GMEActiveBrowser/AggregateTreeCtrl.h	Tue Aug 14 14:26:53 2012	(r2009)
@@ -21,9 +21,6 @@
 	CAggregateMgaObjectProxy(const CMgaObjectProxy& proxy) : CMgaObjectProxy(proxy) {};
 	CAggregateMgaObjectProxy(LPUNKNOWN pMgaObject, objtype_enum type) :
 	    CMgaObjectProxy(pMgaObject, type) {};
-
-	std::shared_ptr<Gdiplus::Bitmap> treeIcon;
-	std::shared_ptr<Gdiplus::Bitmap> expandedTreeIcon;
 };
 
 class CAggregateTreeCtrl : public CMgaMappedTreeCtrl<CAggregateMgaObjectProxy>
@@ -31,7 +28,6 @@
 	friend class CAggregatePropertyPage;
 	friend class CAggregateContextMenu;
 
-	// TODO std::map<_bstr_t, std::shared_ptr<Gdiplus::Bitmap>> treeIconCache;
 	CMapStringToString m_StateBuffer;
 
 	BOOL m_bIsStateStored;