[commit] r1889 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Apr 17 16:35:04 2012
New Revision: 1889

Log:
Read toolbar icon size to properly load toolbar icon

Modified:
   trunk/GME/Gme/GMEApp.cpp

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Tue Apr 17 16:34:54 2012	(r1888)
+++ trunk/GME/Gme/GMEApp.cpp	Tue Apr 17 16:35:04 2012	(r1889)
@@ -930,14 +930,17 @@
 				}
 			}
 
+			int cx = m_userImages.GetImageSize().cx;
+			int cy = m_userImages.GetImageSize().cy;
+
 			if( hModule != NULL )
 			{
-				hIcon = (HICON)::LoadImage(hModule, iconInfo.Mid(commaPos+1), IMAGE_ICON, 16,16, LR_DEFAULTCOLOR);
+				hIcon = (HICON)::LoadImage(hModule, iconInfo.Mid(commaPos+1), IMAGE_ICON, cx, cy, LR_DEFAULTCOLOR);
 			}
 			else
 			{
 				// simple .ico file with path
-				hIcon =(HICON)LoadImage(NULL, iconInfo, IMAGE_ICON, 16, 16, LR_LOADFROMFILE);
+				hIcon =(HICON)LoadImage(NULL, iconInfo, IMAGE_ICON, cx, cy, LR_LOADFROMFILE);
 			}
 			
 			// If icon is not found either in the DLL or a standalone file