[GME-commit] GMESRC/GME/MgaDecorators DecoratorUtil.cpp,1.9,1.10

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/MgaDecorators
In directory escher:/tmp/cvs-serv18896

Modified Files:
	DecoratorUtil.cpp 
Log Message:
If icon specified without extension and not found then enters the branch where it would create the bitmap from resources.
When atoi returns 0, invalid resource number so return 0 and use the default decorator.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: DecoratorUtil.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaDecorators/DecoratorUtil.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DecoratorUtil.cpp	17 Jun 2005 03:20:39 -0000	1.9
--- DecoratorUtil.cpp	14 Sep 2005 20:08:44 -0000	1.10
***************
*** 471,474 ****
--- 471,476 ----
  	if ( strExt == ".res" || strExt.IsEmpty() ) {
  		int iID = atoi( strName.Left( strName.GetLength() - ( ( strExt.IsEmpty() ) ? 0 : 4 ) ) );
+ 		if( iID == 0)    // might be true if specified icon filename
+ 			return NULL; // has no extension and not found yet
  		BitmapRES* pBMP = NULL;
  		if ( bHasTC )