[commit] r1364 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Jun 15 13:16:27 2011
New Revision: 1364

Log:
Cant Clear the static/shared m_userImages or we get a CInvalidArgException after Alt-F,1,Alt-F,C,Alt-F

Modified:
   trunk/GME/Gme/GMEApp.cpp

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Wed Jun 15 10:54:04 2011	(r1363)
+++ trunk/GME/Gme/GMEApp.cpp	Wed Jun 15 13:16:27 2011	(r1364)
@@ -829,16 +829,13 @@
 			const CMFCToolBarButton* pCurrent = (const CMFCToolBarButton*) componentButtons.GetNext(pos); 
 			if(pCurrent->m_bUserButton == TRUE)
 			{
+				// FIXME: this doesn't work, so we leak all the icons. Maybe we could m_userImages.UpdateImage instead?
+				// VERIFY(m_userImages.DeleteImage(pCurrent->GetImage()));
 				int buttonIndex = componentBar.ButtonToIndex(pCurrent);
 				componentBar.RemoveButton(buttonIndex);
-				//componentBar.AdjustLayout();	// CMFCToolBar::AdjustLayout
-				//componentBar.AdjustSizeImmediate(TRUE);
-				//componentBar.RecalcLayout();	// CPane::RecalcLayout
 			}
 		}
 
-		// Clearing user images
-		m_userImages.Clear();
 		componentBar.AdjustLayout();	// CMFCToolBar::AdjustLayout
 		componentBar.AdjustSizeImmediate(TRUE);
 		componentBar.RecalcLayout();	// CPane::RecalcLayout