[GME-commit] GMESRC/Tools/AutoLayout ComponentConfig.h,1.1,1.2 ComponentObj.cpp,1.1,1.2

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

Update of /var/lib/gme/GMESRC/Tools/AutoLayout
In directory braindrain:/tmp/cvs-serv7715

Modified Files:
	ComponentConfig.h ComponentObj.cpp 
Log Message:
no message

CVS User: bogyom

Index: ComponentConfig.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Tools/AutoLayout/ComponentConfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComponentConfig.h	23 Apr 2004 21:51:44 -0000	1.1
--- ComponentConfig.h	26 Apr 2004 19:19:34 -0000	1.2
***************
*** 29,34 ****
  // This is the location of the GME interfaces file (Mga.idl, Meta.idl, etc)
  #define GME_BASE ../../GME
- //#define GME_BASE C:/Program Files/GME
- 
  
  #define BON_ICON_SUPPORT
--- 29,32 ----

Index: ComponentObj.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Tools/AutoLayout/ComponentObj.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComponentObj.cpp	23 Apr 2004 21:51:44 -0000	1.1
--- ComponentObj.cpp	26 Apr 2004 19:19:34 -0000	1.2
***************
*** 59,63 ****
  #include "ComponentLib.h"
  
! #include <ComponentConfig.h>
  
  #include "ComponentObj.h"
--- 59,63 ----
  #include "ComponentLib.h"
  
! #include "ComponentConfig.h"
  
  #include "ComponentObj.h"
***************
*** 1042,1045 ****
--- 1042,1047 ----
  }
  
+ #undef COMRETURN
+ #define COMRETURN(hr) { HRESULT res; if((res = (hr)) != S_OK) return res; }
  
  HRESULT CComponentReg::UnregisterParadigms(regaccessmode_enum loc) {
***************
*** 1052,1060 ****
  HRESULT CComponentReg::RegisterParadigms(regaccessmode_enum loc) {
  	CComPtr<IMgaRegistrar> registrar;
  	COMRETURN(registrar.CoCreateInstance(OLESTR("Mga.MgaRegistrar")));
  	COMRETURN(registrar->RegisterComponent(CComBSTR(COCLASS_PROGID),EXCETYPE, CComBSTR(COMPONENT_NAME), loc));
- #ifdef BON_ICON_SUPPORT
  	COMRETURN(registrar->put_ComponentExtraInfo(loc, CComBSTR(COCLASS_PROGID), CComBSTR("Icon"), CComBSTR(",IDI_COMPICON")));
- #endif
      COMRETURN(registrar->put_ComponentExtraInfo(loc, CComBSTR(COCLASS_PROGID), CComBSTR("Tooltip"), CComBSTR(TOOLTIP_TEXT)));
  
--- 1054,1061 ----
  HRESULT CComponentReg::RegisterParadigms(regaccessmode_enum loc) {
  	CComPtr<IMgaRegistrar> registrar;
+     
  	COMRETURN(registrar.CoCreateInstance(OLESTR("Mga.MgaRegistrar")));
  	COMRETURN(registrar->RegisterComponent(CComBSTR(COCLASS_PROGID),EXCETYPE, CComBSTR(COMPONENT_NAME), loc));
  	COMRETURN(registrar->put_ComponentExtraInfo(loc, CComBSTR(COCLASS_PROGID), CComBSTR("Icon"), CComBSTR(",IDI_COMPICON")));
      COMRETURN(registrar->put_ComponentExtraInfo(loc, CComBSTR(COCLASS_PROGID), CComBSTR("Tooltip"), CComBSTR(TOOLTIP_TEXT)));