[commit] r1914 - trunk/SDK/DecoratorLib

[GMESRC Repository Notifications]

Author: hnine
Date: Wed Apr 25 14:03:41 2012
New Revision: 1914

Log:
Provide default bitmap.

Modified:
   trunk/SDK/DecoratorLib/BitmapPart.cpp

Modified: trunk/SDK/DecoratorLib/BitmapPart.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/BitmapPart.cpp	Fri Apr 20 13:12:56 2012	(r1913)
+++ trunk/SDK/DecoratorLib/BitmapPart.cpp	Wed Apr 25 14:03:41 2012	(r1914)
@@ -136,7 +136,7 @@
 			if (strIcon.Right(4) == ".emf" || strIcon.Right(4) == ".wmf")
 				preferences[PREF_ITEMRESIZABLE] = PreferenceVariant(true);
 		}
-		if (!m_pBitmap) {
+		if (!m_pBitmap && preferences.find(PREF_ICONDEFAULT) != preferences.end()) {
 			strIcon = *preferences.find(PREF_ICONDEFAULT)->second.uValue.pstrValue;
 #ifndef OLD_DECORATOR_LOOKANDFEEL
 			if (m_bOverlay)
@@ -152,6 +152,9 @@
 			else
 				m_pTileVector = getFacilities().getTileVector(TILE_ATOMDEFAULT);
 		}
+		if (!m_pBitmap) {
+			m_pBitmap = getFacilities().getBitmap("2160.res");
+		}
 	}
 
 	VectorPart::InitializeEx(pProject, pPart, pFCO, parentWnd, preferences);