Log Message:
-----------
Fix for view assuming icon is an ac resource before checking for an icon library.
Should allow plugins to set custom decal bar icons in the xml now by specifiying a resource id and their dll.
Modified Files:
--------------
/cvsroot/decaldev/source/Inject:
View.cpp
Revision Data
-------------
Index: View.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/View.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- View.cpp 28 Sep 2003 19:12:30 -0000 1.26
+++ View.cpp 30 Sep 2003 16:44:17 -0000 1.27
@@ -106,14 +106,17 @@
_ASSERTE( vTitle.vt == VT_BSTR );
// Fill this into a view param
-// GKusnick: Handle no-icon case without asserting.
-// _ASSERTE( vIcon.vt != VT_NULL );
- m_VP.icon = ( vIcon.vt != VT_NULL ) ? static_cast< long >( vIcon ) + 0x06000000 : 0;
-
if( vIconModule.vt == VT_BSTR )
cManager::_p->LoadResourceModule( vIconModule.bstrVal, &m_VP.iconLibrary );
else
m_VP.iconLibrary = 0;
+
+// GKusnick: Handle no-icon case without asserting.
+// _ASSERTE( vIcon.vt != VT_NULL );
+ m_VP.icon = ( vIcon.vt != VT_NULL ) ? static_cast< long >( vIcon ) : 0;
+ // Para: shouldn't add 0x06000000 if there's an iconlibrary
+ if (m_VP.iconLibrary == 0)
+ m_VP.icon += 0x06000000;
if(vLeft.vt == VT_NULL)
m_VP.left = 0;
|
