[GME-commit] GMESRC/GME/Gme GMEOLEApp.cpp,1.12,1.13

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

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv7765

Modified Files:
	GMEOLEApp.cpp 
Log Message:
Fixed IGMEOleApp interface's mess with dispids and DISP_FUNCTION macros (broken since OleIt has been introduced).
Rule: the dispids assigned in gme.idl must conform to the order of DISP_FUNCTION macros in the CGmeOleApp class' DISPATCH_MAP.
Modified Files:
 	GMEOLEApp.cpp 


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEOLEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEApp.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GMEOLEApp.cpp	30 Jan 2006 20:47:54 -0000	1.12
--- GMEOLEApp.cpp	1 Feb 2006 19:39:03 -0000	1.13
***************
*** 65,68 ****
--- 65,74 ----
  END_MESSAGE_MAP()
  
+ 
+ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ // comment by Zoltan Molnar: if you happen to enhance the public interface please make sure that 
+ // the dispIDs (found in gme.idl) correspond with the order of macros in the dispatch map below
+ // hint: always add to the tail of the DISPATCH_MAP
+ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  BEGIN_DISPATCH_MAP(CGMEOLEApp, CCmdTarget)
  	//{{AFX_DISPATCH_MAP(CGMEOLEApp)
***************
*** 76,80 ****
  	DISP_PROPERTY_EX(CGMEOLEApp, "Panels", GetPanels, SetPanels, VT_DISPATCH)
  	DISP_PROPERTY_EX(CGMEOLEApp, "ConsoleContents", GetConsoleContents, SetConsoleContents, VT_BSTR)
! 	DISP_PROPERTY_EX(CGMEOLEApp, "OleIt", GetOleIt, SetOleIt, VT_DISPATCH)
  	DISP_FUNCTION(CGMEOLEApp, "CreateProject", CreateProject, VT_EMPTY, VTS_BSTR VTS_BSTR)
  	DISP_FUNCTION(CGMEOLEApp, "OpenProject", OpenProject, VT_EMPTY, VTS_BSTR)
--- 82,86 ----
  	DISP_PROPERTY_EX(CGMEOLEApp, "Panels", GetPanels, SetPanels, VT_DISPATCH)
  	DISP_PROPERTY_EX(CGMEOLEApp, "ConsoleContents", GetConsoleContents, SetConsoleContents, VT_BSTR)
! 
  	DISP_FUNCTION(CGMEOLEApp, "CreateProject", CreateProject, VT_EMPTY, VTS_BSTR VTS_BSTR)
  	DISP_FUNCTION(CGMEOLEApp, "OpenProject", OpenProject, VT_EMPTY, VTS_BSTR)
***************
*** 107,110 ****
--- 113,119 ----
  	DISP_FUNCTION(CGMEOLEApp, "GridShow", GridShow, VT_EMPTY, VTS_BOOL)
  	DISP_FUNCTION(CGMEOLEApp, "AttributepanelPage", AttributepanelPage, VT_EMPTY, VTS_I4)
+ 
+ 	DISP_PROPERTY_EX(CGMEOLEApp, "OleIt", GetOleIt, SetOleIt, VT_DISPATCH)
+ 
  	DISP_FUNCTION(CGMEOLEApp, "DisableComp", DisableComp, VT_EMPTY, VTS_BSTR VTS_BOOL)
  	DISP_FUNCTION(CGMEOLEApp, "DisableCompForKinds", DisableCompForKinds, VT_EMPTY, VTS_BSTR VTS_BSTR)
***************
*** 114,117 ****
--- 123,130 ----
  	//}}AFX_DISPATCH_MAP
  END_DISPATCH_MAP()
+ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ // if you modify the interface IGmeOleApp: please see comment above how to
+ // keep in sync the DISPIDs (in gme.idl) and the order of DISP_FUNCTION macros
+ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  // Note: we add support for IID_IGMEOLEApp to support typesafe binding