[GME-commit] GMESRC/GME/ConstraintManager ConstraintManager.vcproj,NONE,1.1 ConstraintManager.cpp,1.6,1.7 ConstraintManager.def,1.1,1.2 ConstraintManager.rc,1.31,1.32 ConstraintMgr.cpp,1.19,1.20 ExpressionChecker.cpp,1.17,1.18 Forcelib.h,1.1,1.2 GMEConstraintEx.h,1.8,1.9 OCLCommon.h,1.5,1.6 OCLContext.h,1.5,1.6 OCLFeature.h,1.3,1.4 OCLObjectExBasic.cpp,1.8,1.9 OCLObjectExGME.cpp,1.10,1.11 OCLParserStatic.cpp,1.6,1.7 OCLTypeExBasic.cpp,1.18,1.19 OclConstraint.cpp,1.7,1.8 Regexp.h,1.1,1.2 StdAfx.cpp,1.2,1.3 TreeCtrlEx.cpp,1.1,1.2 ocl.g,1.14,1.15 resource.h,1.22,1.23 AFXIMPL.H,1.1,NONE ConstraintManager.dsp,1.23,NONE

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:36 CST 2005


Update of /var/lib/gme/GMESRC/GME/ConstraintManager
In directory braindrain:/tmp/cvs-serv19193/GME/ConstraintManager

Modified Files:
	ConstraintManager.cpp ConstraintManager.def 
	ConstraintManager.rc ConstraintMgr.cpp ExpressionChecker.cpp 
	Forcelib.h GMEConstraintEx.h OCLCommon.h OCLContext.h 
	OCLFeature.h OCLObjectExBasic.cpp OCLObjectExGME.cpp 
	OCLParserStatic.cpp OCLTypeExBasic.cpp OclConstraint.cpp 
	Regexp.h StdAfx.cpp TreeCtrlEx.cpp ocl.g resource.h 
Added Files:
	ConstraintManager.vcproj 
Removed Files:
	AFXIMPL.H ConstraintManager.dsp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

--- NEW FILE: ConstraintManager.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="ConstraintManager"
	SccProjectName=""
	SccLocalPath=""
	Keyword="AtlProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="2"
[...1325 lines suppressed...]
			<File
				RelativePath="ExpressionChecker.rgs">
			</File>
			<File
				RelativePath="line_icons.bmp">
			</File>
			<File
				RelativePath="tree_icons.bmp">
			</File>
			<File
				RelativePath="warning.ico">
			</File>
		</Filter>
	</Files>
	<Globals>
		<Global
			Name="RESOURCE_FILE"
			Value="ConstraintManager.rc"/>
	</Globals>
</VisualStudioProject>

Index: ConstraintManager.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/ConstraintManager.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConstraintManager.cpp	18 May 2004 13:30:58 -0000	1.6
--- ConstraintManager.cpp	26 Jan 2005 17:28:23 -0000	1.7
***************
*** 78,82 ****
  STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
  {
!     return _Module.GetClassObject(rclsid, riid, ppv);
  }
  
--- 78,83 ----
  STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
  {
!     AFX_MANAGE_STATE(AfxGetStaticModuleState());//z1
! 	return _Module.GetClassObject(rclsid, riid, ppv);
  }
  
***************
*** 121,125 ****
  STDAPI DllRegisterServer(void)
  {
!     // registers object, typelib and all interfaces in typelib
  	HRESULT res = _Module.RegisterServer(TRUE);
  	if(res == S_OK) {
--- 122,127 ----
  STDAPI DllRegisterServer(void)
  {
!     AFX_MANAGE_STATE(AfxGetStaticModuleState());//z1
! 	// registers object, typelib and all interfaces in typelib
  	HRESULT res = _Module.RegisterServer(TRUE);
  	if(res == S_OK) {
***************
*** 134,138 ****
  STDAPI DllUnregisterServer(void)
  {
!     HRESULT res = _Module.UnregisterServer(TRUE);
  	if(res == S_OK) {
  		COMRETURN( CComponentReg::UnregisterComponent());
--- 136,141 ----
  STDAPI DllUnregisterServer(void)
  {
!     AFX_MANAGE_STATE(AfxGetStaticModuleState());//z1
! 	HRESULT res = _Module.UnregisterServer(TRUE);
  	if(res == S_OK) {
  		COMRETURN( CComponentReg::UnregisterComponent());

Index: ConstraintManager.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/ConstraintManager.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConstraintManager.def	16 Aug 2002 18:01:00 -0000	1.1
--- ConstraintManager.def	26 Jan 2005 17:28:23 -0000	1.2
***************
*** 4,9 ****
  
  EXPORTS
! 	DllCanUnloadNow     @1 PRIVATE
! 	DllGetClassObject   @2 PRIVATE
! 	DllRegisterServer   @3 PRIVATE
! 	DllUnregisterServer	@4 PRIVATE
--- 4,9 ----
  
  EXPORTS
! 	DllCanUnloadNow     PRIVATE
! 	DllGetClassObject   PRIVATE
! 	DllRegisterServer   PRIVATE
! 	DllUnregisterServer	PRIVATE

Index: ConstraintManager.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/ConstraintManager.rc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ConstraintManager.rc	18 May 2004 15:13:46 -0000	1.31
--- ConstraintManager.rc	26 Jan 2005 17:28:23 -0000	1.32
***************
*** 1,3 ****
! //Microsoft Developer Studio generated resource script.
  //
  #include "resource.h"
--- 1,3 ----
! // Microsoft Visual C++ generated resource script.
  //
  #include "resource.h"
***************
*** 28,37 ****
  //
  
! 1 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "resource.h\0"
  END
  
! 2 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "#include ""afxres.h""\r\n"
--- 28,37 ----
  //
  
! 1 TEXTINCLUDE 
  BEGIN
      "resource.h\0"
  END
  
! 2 TEXTINCLUDE 
  BEGIN
      "#include ""afxres.h""\r\n"
***************
*** 39,43 ****
  END
  
! 3 TEXTINCLUDE DISCARDABLE 
  BEGIN
      "1 TYPELIB ""ConstraintManager.tlb""\r\n"
--- 39,43 ----
  END
  
! 3 TEXTINCLUDE 
  BEGIN
      "1 TYPELIB ""ConstraintManager.tlb""\r\n"
***************
*** 48,52 ****
  
  
- #ifndef _MAC
  /////////////////////////////////////////////////////////////////////////////
  //
--- 48,51 ----
***************
*** 71,83 ****
          BLOCK "040904B0"
          BEGIN
!             VALUE "CompanyName", "\0"
!             VALUE "FileDescription", "ConstraintManager Module\0"
!             VALUE "FileVersion", "1, 0, 0, 1\0"
!             VALUE "InternalName", "ConstraintManager\0"
!             VALUE "LegalCopyright", "Copyright 2002\0"
!             VALUE "OriginalFilename", "ConstraintManager.DLL\0"
!             VALUE "ProductName", "ConstraintManager Module\0"
!             VALUE "ProductVersion", "1, 0, 0, 1\0"
!             VALUE "OLESelfRegister", "\0"
          END
      END
--- 70,80 ----
          BLOCK "040904B0"
          BEGIN
!             VALUE "FileDescription", "ConstraintManager Module"
!             VALUE "FileVersion", "1, 0, 0, 1"
!             VALUE "InternalName", "ConstraintManager"
!             VALUE "LegalCopyright", "Copyright 2002"
!             VALUE "OriginalFilename", "ConstraintManager.DLL"
!             VALUE "ProductName", "ConstraintManager Module"
!             VALUE "ProductVersion", "1, 0, 0, 1"
          END
      END
***************
*** 88,93 ****
  END
  
- #endif    // !_MAC
- 
  
  /////////////////////////////////////////////////////////////////////////////
--- 85,88 ----
***************
*** 96,101 ****
  //
  
! IDR_CONSTRAINTMGR       REGISTRY DISCARDABLE    "ConstraintMgr.rgs"
! IDR_EXPRESSIONCHECKER   REGISTRY DISCARDABLE    "ExpressionChecker.rgs"
  
  /////////////////////////////////////////////////////////////////////////////
--- 91,96 ----
  //
  
! IDR_CONSTRAINTMGR       REGISTRY                "ConstraintMgr.rgs"
! IDR_EXPRESSIONCHECKER   REGISTRY                "ExpressionChecker.rgs"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 105,109 ****
  
  IDD_SYNTAX_SEMANTIC_DIALOG DIALOGEX 0, 0, 480, 273
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Syntax and Semantic Errors"
  FONT 8, "MS Sans Serif", 0, 0, 0x1
--- 100,104 ----
  
  IDD_SYNTAX_SEMANTIC_DIALOG DIALOGEX 0, 0, 480, 273
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Syntax and Semantic Errors"
  FONT 8, "MS Sans Serif", 0, 0, 0x1
***************
*** 131,135 ****
  
  IDD_VIOLATION_DIALOG DIALOGEX 0, 0, 496, 291
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Violations"
  FONT 8, "MS Sans Serif", 0, 0, 0x1
--- 126,130 ----
  
  IDD_VIOLATION_DIALOG DIALOGEX 0, 0, 496, 291
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Violations"
  FONT 8, "MS Sans Serif", 0, 0, 0x1
***************
*** 167,172 ****
  END
  
! IDD_BROWSER_DIALOG DIALOG DISCARDABLE  0, 0, 299, 353
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Browser"
  FONT 8, "MS Sans Serif"
--- 162,167 ----
  END
  
! IDD_BROWSER_DIALOG DIALOG  0, 0, 299, 353
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Browser"
  FONT 8, "MS Sans Serif"
***************
*** 184,200 ****
  
  IDD_PROGRESS_DIALOG DIALOGEX 0, 0, 232, 66
! STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Evaluation"
  FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
      DEFPUSHBUTTON   "Cancel",NOEX_BTNOK,91,46,50,14,NOT WS_VISIBLE
!     CONTROL         "Progress1",NOEX_PROGRESS,"msctls_progress32",PBS_SMOOTH | 
!                     WS_BORDER,11,26,209,14,WS_EX_CLIENTEDGE
      CTEXT           "There was no Constraint Violation found.",
                      NOEX_LBLMESSAGE,6,9,218,12
  END
  
! IDD_PROPERTIES_EVENT_PAGE DIALOG DISCARDABLE  0, 0, 351, 197
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
--- 179,195 ----
  
  IDD_PROGRESS_DIALOG DIALOGEX 0, 0, 232, 66
! STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Evaluation"
  FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
      DEFPUSHBUTTON   "Cancel",NOEX_BTNOK,91,46,50,14,NOT WS_VISIBLE
!     CONTROL         "Progress1",NOEX_PROGRESS,"msctls_progress32",WS_BORDER | 
!                     0x1,11,26,209,14,WS_EX_CLIENTEDGE
      CTEXT           "There was no Constraint Violation found.",
                      NOEX_LBLMESSAGE,6,9,218,12
  END
  
! IDD_PROPERTIES_EVENT_PAGE DIALOG  0, 0, 351, 197
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
***************
*** 249,254 ****
  END
  
! IDD_PROPERTIES_IDENTITY_PAGE DIALOG DISCARDABLE  0, 0, 352, 197
! STYLE WS_CHILD | WS_VISIBLE
  FONT 8, "MS Sans Serif"
  BEGIN
--- 244,249 ----
  END
  
! IDD_PROPERTIES_IDENTITY_PAGE DIALOG  0, 0, 352, 197
! STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE
  FONT 8, "MS Sans Serif"
  BEGIN
***************
*** 272,277 ****
  END
  
! IDD_PROPERTIES_EXPRESSION_PAGE DIALOG DISCARDABLE  0, 0, 351, 194
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
--- 267,272 ----
  END
  
! IDD_PROPERTIES_EXPRESSION_PAGE DIALOG  0, 0, 351, 194
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
***************
*** 285,290 ****
  END
  
! IDD_PROPERTIES_DIALOG DIALOG DISCARDABLE  0, 0, 383, 249
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Properties"
  FONT 8, "MS Sans Serif"
--- 280,285 ----
  END
  
! IDD_PROPERTIES_DIALOG DIALOG  0, 0, 383, 249
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
  CAPTION "Constraint Properties"
  FONT 8, "MS Sans Serif"
***************
*** 296,300 ****
  
  IDD_BROWSER_CONSTRAINT_PAGE DIALOGEX 0, 0, 270, 333
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
--- 291,295 ----
  
  IDD_BROWSER_CONSTRAINT_PAGE DIALOGEX 0, 0, 270, 333
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
***************
*** 308,313 ****
  END
  
! IDD_BROWSER_SETTINGS_PAGE DIALOG DISCARDABLE  0, 0, 218, 323
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
--- 303,308 ----
  END
  
! IDD_BROWSER_SETTINGS_PAGE DIALOG  0, 0, 218, 323
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
***************
*** 360,364 ****
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO DISCARDABLE 
  BEGIN
      IDD_SYNTAX_SEMANTIC_DIALOG, DIALOG
--- 355,359 ----
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO 
  BEGIN
      IDD_SYNTAX_SEMANTIC_DIALOG, DIALOG
***************
*** 450,459 ****
  //
  
! IDB_LINEICONS           BITMAP  DISCARDABLE     "line_icons.bmp"
! IDB_CONSTRAINTICONS     BITMAP  DISCARDABLE     "constraint_icons.bmp"
! IDB_ERRORICONS          BITMAP  DISCARDABLE     "error_icons.bmp"
! IDB_CHECKICONS          BITMAP  DISCARDABLE     "check_icons.bmp"
! IDB_TREEICONS           BITMAP  DISCARDABLE     "tree_icons.bmp"
! IDB_CONSTRAINTSTATEICONS BITMAP  DISCARDABLE     "constraintstate_icons.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
--- 445,454 ----
  //
  
! IDB_LINEICONS           BITMAP                  "line_icons.bmp"
! IDB_CONSTRAINTICONS     BITMAP                  "constraint_icons.bmp"
! IDB_ERRORICONS          BITMAP                  "error_icons.bmp"
! IDB_CHECKICONS          BITMAP                  "check_icons.bmp"
! IDB_TREEICONS           BITMAP                  "tree_icons.bmp"
! IDB_CONSTRAINTSTATEICONS BITMAP                  "constraintstate_icons.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 464,471 ****
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDI_CMERROR             ICON    DISCARDABLE     "error.ico"
! IDI_EXPAND              ICON    DISCARDABLE     "expand.ico"
! IDI_EC_CHECKALL         ICON    DISCARDABLE     "ec_icon.ico"
! IDI_CMWARNING           ICON    DISCARDABLE     "warning.ico"
  
  /////////////////////////////////////////////////////////////////////////////
--- 459,466 ----
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDI_CMERROR             ICON                    "error.ico"
! IDI_EXPAND              ICON                    "expand.ico"
! IDI_EC_CHECKALL         ICON                    "ec_icon.ico"
! IDI_CMWARNING           ICON                    "warning.ico"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 511,515 ****
  //
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      IDS_PROJNAME            "ConstraintManager"
--- 506,510 ----
  //
  
! STRINGTABLE 
  BEGIN
      IDS_PROJNAME            "ConstraintManager"

Index: ConstraintMgr.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/ConstraintMgr.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ConstraintMgr.cpp	12 Jan 2005 17:55:09 -0000	1.19
--- ConstraintMgr.cpp	26 Jan 2005 17:28:23 -0000	1.20
***************
*** 15,18 ****
--- 15,19 ----
  STDMETHODIMP CMgrEventSink::GlobalEvent( globalevent_enum event )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return cm->GlobalEvent(event);
  }
***************
*** 20,23 ****
--- 21,25 ----
  STDMETHODIMP CMgrEventSink::ObjectEvent(IMgaObject *obj, unsigned long eventmask, VARIANT v)
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return cm->ObjectEvent( obj, eventmask, v );
  }
***************
*** 232,235 ****
--- 234,238 ----
  STDMETHODIMP CConstraintMgr::get_InteractiveMode( VARIANT_BOOL* enabled )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	*enabled = ( m_Facade.m_bEnabledInteractions ) ? VARIANT_TRUE : VARIANT_FALSE;
  	return S_OK;
***************
*** 246,249 ****
--- 249,253 ----
  STDMETHODIMP CConstraintMgr::get_ComponentParameter( BSTR name, VARIANT *pVal )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return S_OK;
  }
***************
*** 251,254 ****
--- 255,259 ----
  STDMETHODIMP CConstraintMgr::put_ComponentParameter(BSTR name, VARIANT newVal)
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return S_OK;
  }
***************
*** 256,259 ****
--- 261,265 ----
  STDMETHODIMP CConstraintMgr::get_Paradigm( BSTR *pname )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( ! pname )
  		return E_MGA_OUTPTR_NULL;
***************
*** 266,269 ****
--- 272,276 ----
  STDMETHODIMP CConstraintMgr::get_ComponentName( BSTR *pname )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( ! pname )
  		return E_MGA_OUTPTR_NULL;
***************
*** 276,279 ****
--- 283,287 ----
  STDMETHODIMP CConstraintMgr::get_ComponentProgID( BSTR *pname )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( !pname )
  		return E_MGA_OUTPTR_NULL;
***************
*** 286,289 ****
--- 294,298 ----
  STDMETHODIMP CConstraintMgr::get_ComponentType( componenttype_enum *ct )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( ! ct )
  		return E_MGA_OUTPTR_NULL;
***************
*** 293,296 ****
--- 302,306 ----
  
  STDMETHODIMP CConstraintMgr::Invoke(IMgaProject *p, IMgaFCOs *os, long k) {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	COMTRY {
  		CComPtr<IMgaFCO> o;
***************
*** 310,313 ****
--- 320,324 ----
  STDMETHODIMP CConstraintMgr::InvokeEx(IMgaProject *p, IMgaFCO *o, IMgaFCOs *, long k)
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return ObjectsInvokeEx( p, o, NULL, k );
  }

Index: ExpressionChecker.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/ExpressionChecker.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ExpressionChecker.cpp	13 Oct 2004 15:17:54 -0000	1.17
--- ExpressionChecker.cpp	26 Jan 2005 17:28:23 -0000	1.18
***************
*** 16,19 ****
--- 16,20 ----
  STDMETHODIMP CExpEventSink::GlobalEvent( globalevent_enum event )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return ec->GlobalEvent( event );
  }
***************
*** 21,24 ****
--- 22,26 ----
  STDMETHODIMP CExpEventSink::ObjectEvent( IMgaObject *obj, unsigned long eventmask, VARIANT v )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return ec->ObjectEvent( obj, eventmask, v );
  }
***************
*** 32,39 ****
  STDMETHODIMP CExpressionChecker::ObjectsInvokeEx( IMgaProject *p, IMgaObject *o, IMgaObjects* os, long k )
  {
  	if ( ! m_Facade.m_bEnabled )
  		return S_OK;
  
! 	AFX_MANAGE_STATE( AfxGetStaticModuleState() );
  
  	COMTRY {
--- 34,42 ----
  STDMETHODIMP CExpressionChecker::ObjectsInvokeEx( IMgaProject *p, IMgaObject *o, IMgaObjects* os, long k )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if ( ! m_Facade.m_bEnabled )
  		return S_OK;
  
! 	//AFX_MANAGE_STATE( AfxGetStaticModuleState() );
  
  	COMTRY {
***************
*** 93,104 ****
  STDMETHODIMP CExpressionChecker::ObjectEvent( IMgaObject *obj, unsigned long eventmask, VARIANT v )
  {
  	if ( ! m_Facade.m_bEnabled || ! m_Facade.m_bEnabledInteractions || ! m_Facade.m_bEnabledEvents ) {
  		return S_OK;
  	}
  
- 	AFX_MANAGE_STATE( AfxGetStaticModuleState() );
- 	
  	CWnd* pMainWindow = AfxGetApp()->m_pActiveWnd;
! 
  	COMTRY {
  
--- 96,107 ----
  STDMETHODIMP CExpressionChecker::ObjectEvent( IMgaObject *obj, unsigned long eventmask, VARIANT v )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
+ 
  	if ( ! m_Facade.m_bEnabled || ! m_Facade.m_bEnabledInteractions || ! m_Facade.m_bEnabledEvents ) {
  		return S_OK;
  	}
  
  	CWnd* pMainWindow = AfxGetApp()->m_pActiveWnd;
! 	
  	COMTRY {
  
***************
*** 190,193 ****
--- 193,197 ----
  STDMETHODIMP CExpressionChecker::get_ComponentParameter( BSTR name, VARIANT *pVal )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return S_OK;
  }
***************
*** 195,198 ****
--- 199,203 ----
  STDMETHODIMP CExpressionChecker::put_ComponentParameter( BSTR name, VARIANT newVal )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return S_OK;
  }
***************
*** 200,203 ****
--- 205,209 ----
  STDMETHODIMP CExpressionChecker::get_Paradigm( BSTR *pname )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( ! pname )
  		return E_MGA_OUTPTR_NULL;
***************
*** 210,213 ****
--- 216,220 ----
  STDMETHODIMP CExpressionChecker::get_ComponentName( BSTR *pname )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( ! pname )
  		return E_MGA_OUTPTR_NULL;
***************
*** 221,224 ****
--- 228,232 ----
  STDMETHODIMP CExpressionChecker::get_ComponentProgID( BSTR *pname )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( ! pname )
  		return E_MGA_OUTPTR_NULL;
***************
*** 231,234 ****
--- 239,243 ----
  STDMETHODIMP CExpressionChecker::get_ComponentType( componenttype_enum *ct )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	if( ! ct )
  		return E_MGA_OUTPTR_NULL;
***************
*** 239,242 ****
--- 248,252 ----
  STDMETHODIMP CExpressionChecker::Invoke( IMgaProject *p, IMgaFCOs *os, long k )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	COMTRY {
  		CComPtr<IMgaFCO> o;
***************
*** 256,259 ****
--- 266,270 ----
  STDMETHODIMP CExpressionChecker::InvokeEx( IMgaProject *p, IMgaFCO *o, IMgaFCOs *, long k )
  {
+ 	AFX_MANAGE_STATE( AfxGetStaticModuleState());//z
  	return ObjectsInvokeEx(p, o, NULL, k);
  }

Index: Forcelib.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/Forcelib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Forcelib.h	20 Aug 2002 15:39:00 -0000	1.1
--- Forcelib.h	26 Jan 2005 17:28:24 -0000	1.2
***************
*** 21,37 ****
  	#ifndef _UNICODE
  		#ifdef _DEBUG
! 			#pragma comment(lib, "mfc42d.lib")
! 			#pragma comment(lib, "mfcs42d.lib")
  		#else
! 			#pragma comment(lib, "mfc42.lib")
! 			#pragma comment(lib, "mfcs42.lib")
  		#endif
  	#else
  		#ifdef _DEBUG
! 			#pragma comment(lib, "mfc42ud.lib")
! 			#pragma comment(lib, "mfcs42ud.lib")
  		#else
! 			#pragma comment(lib, "mfc42u.lib")
! 			#pragma comment(lib, "mfcs42u.lib")
  		#endif
  	#endif
--- 21,37 ----
  	#ifndef _UNICODE
  		#ifdef _DEBUG
! 			#pragma comment(lib, "mfc71d.lib")
! 			#pragma comment(lib, "mfcs71d.lib")
  		#else
! 			#pragma comment(lib, "mfc71.lib")
! 			#pragma comment(lib, "mfcs71.lib")
  		#endif
  	#else
  		#ifdef _DEBUG
! 			#pragma comment(lib, "mfc71ud.lib")
! 			#pragma comment(lib, "mfcs71ud.lib")
  		#else
! 			#pragma comment(lib, "mfc71u.lib")
! 			#pragma comment(lib, "mfcs71u.lib")
  		#endif
  	#endif

Index: GMEConstraintEx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/GMEConstraintEx.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GMEConstraintEx.h	13 Oct 2004 15:17:54 -0000	1.8
--- GMEConstraintEx.h	26 Jan 2005 17:28:24 -0000	1.9
***************
*** 82,86 ****
  		: public ConstraintBase, public OclCommon::ReferenceCountable< Constraint >
  	{
! 		typedef enum EnableInfo { CE_NONE = 0, CE_ENABLED = 1, CE_ENABLED_INHERITED = 2, CE_ENABLED_READONLY = 3, CE_DISABLED = 4, CE_DISABLED_INHERITED = 5, CE_DISABLED_READONLY = 6 };
  
  		private :
--- 82,87 ----
  		: public ConstraintBase, public OclCommon::ReferenceCountable< Constraint >
  	{
! 		public :
! 			typedef enum EnableInfo { CE_NONE = 0, CE_ENABLED = 1, CE_ENABLED_INHERITED = 2, CE_ENABLED_READONLY = 3, CE_DISABLED = 4, CE_DISABLED_INHERITED = 5, CE_DISABLED_READONLY = 6 };
  
  		private :

Index: OCLCommon.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLCommon.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OCLCommon.h	13 Oct 2004 15:17:54 -0000	1.5
--- OCLCommon.h	26 Jan 2005 17:28:24 -0000	1.6
***************
*** 9,14 ****
  #define OCLCommon_h
  
- #include <stl_user_config.h>
- 
  #include <vector>
  #include <map>
--- 9,12 ----

Index: OCLContext.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLContext.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OCLContext.h	13 Oct 2004 15:17:54 -0000	1.5
--- OCLContext.h	26 Jan 2005 17:28:24 -0000	1.6
***************
*** 200,204 ****
  	{
  		public :
! 			typedef RealContext< TItem >::CItem StateItem;
  			typedef std::vector< StateItem > StateItemVector;
  
--- 200,204 ----
  	{
  		public :
! 			typedef typename RealContext< TItem >::CItem StateItem;
  			typedef std::vector< StateItem > StateItemVector;
  

Index: OCLFeature.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLFeature.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OCLFeature.h	13 Oct 2004 15:17:54 -0000	1.3
--- OCLFeature.h	26 Jan 2005 17:28:24 -0000	1.4
***************
*** 352,356 ****
  			static bool IsChecked( const DependencySet& ds )
  			{
! 				for ( DependencySet::iterator i = ds.begin() ; i != ds.end() ; i++ )
  					if ( ! (*i).m_bChecked )
  						return false;
--- 352,356 ----
  			static bool IsChecked( const DependencySet& ds )
  			{
! 				for ( DependencySet::const_iterator i = ds.begin() ; i != ds.end() ; i++ )
  					if ( ! (*i).m_bChecked )
  						return false;
***************
*** 360,364 ****
  			static bool IsFailed( const DependencySet& ds )
  			{
! 				for ( DependencySet::iterator i = ds.begin() ; i != ds.end() ; i++ )
  					if ( ! (*i).m_bChecked )
  						return false;
--- 360,364 ----
  			static bool IsFailed( const DependencySet& ds )
  			{
! 				for ( DependencySet::const_iterator i = ds.begin() ; i != ds.end() ; i++ )
  					if ( ! (*i).m_bChecked )
  						return false;
***************
*** 388,392 ****
  			{
  				std::string strOut;
! 				for ( DependencySet::iterator it = setDependencies.begin() ; it != setDependencies.end() ; it++ )
  					strOut += (*it).Print() + "\r\n";
  				return strOut;
--- 388,392 ----
  			{
  				std::string strOut;
! 				for ( DependencySet::const_iterator it = setDependencies.begin() ; it != setDependencies.end() ; it++ )
  					strOut += (*it).Print() + "\r\n";
  				return strOut;

Index: OCLObjectExBasic.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLObjectExBasic.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OCLObjectExBasic.cpp	13 Oct 2004 15:17:54 -0000	1.8
--- OCLObjectExBasic.cpp	26 Jan 2005 17:28:24 -0000	1.9
***************
*** 294,298 ****
  	void Integer::SetValue( long value )
  	{
! 		SetValue( (double) value );
  	}
  
--- 294,298 ----
  	void Integer::SetValue( long value )
  	{
! 		Real::SetValue( (double) value );
  	}
  

Index: OCLObjectExGME.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLObjectExGME.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OCLObjectExGME.cpp	13 Oct 2004 15:17:54 -0000	1.10
--- OCLObjectExGME.cpp	26 Jan 2005 17:28:24 -0000	1.11
***************
*** 334,338 ****
  		CString strName;
  		COMTHROW( m_Value->get_Name( PutOut( strName ) ) );
! 		return "gme::Project { name: " + strName + "; }";
  	}
  
--- 334,338 ----
  		CString strName;
  		COMTHROW( m_Value->get_Name( PutOut( strName ) ) );
! 		return std::string("gme::Project { name: ") + (LPCTSTR) strName + "; }";
  	}
  

Index: OCLParserStatic.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLParserStatic.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OCLParserStatic.cpp	13 Oct 2004 15:17:54 -0000	1.6
--- OCLParserStatic.cpp	26 Jan 2005 17:28:24 -0000	1.7
***************
*** 178,182 ****
  {
  	TokenSet setResult( setTokens1 );
! 	for ( TokenSet::iterator i = setTokens2.begin() ; i != setTokens2.end() ; ++i )
  		setResult.insert( *i );
  	return setResult;
--- 178,182 ----
  {
  	TokenSet setResult( setTokens1 );
! 	for ( TokenSet::const_iterator i = setTokens2.begin() ; i != setTokens2.end() ; ++i )
  		setResult.insert( *i );
  	return setResult;
***************
*** 303,307 ****
  {
  	std::string strTokens( " " );
! 	for ( TokenSet::iterator i = setTokens.begin() ; i != setTokens.end() ; i++ )
  		strTokens += PrintToken( *i, true ) + " ";
  	return strTokens;
--- 303,307 ----
  {
  	std::string strTokens( " " );
! 	for ( TokenSet::const_iterator i = setTokens.begin() ; i != setTokens.end() ; i++ )
  		strTokens += PrintToken( *i, true ) + " ";
  	return strTokens;
***************
*** 315,319 ****
  		case MULTIPLE :	case DIVIDE :	case DIVIDEINT : case PERCENT : case MODULO :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_MULTIPLICATIVE );
  				if ( i != setTokens.end() )
  					return true;
--- 315,319 ----
  		case MULTIPLE :	case DIVIDE :	case DIVIDEINT : case PERCENT : case MODULO :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_MULTIPLICATIVE );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 322,326 ****
  		case NOT :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_UNARY );
  				if ( i != setTokens.end() )
  					return true;
--- 322,326 ----
  		case NOT :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_UNARY );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 329,333 ****
  		case MINUS :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_UNARY );
  				if ( i != setTokens.end() )
  					return true;
--- 329,333 ----
  		case MINUS :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_UNARY );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 339,343 ****
  		case PLUS :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_ADDITIVE );
  				if ( i != setTokens.end() )
  					return true;
--- 339,343 ----
  		case PLUS :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_ADDITIVE );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 346,350 ****
  		case LESS : case LESSEQUAL : case LESSGREATER : case EQUAL : case DOUBLEEQUAL : case NONEQUAL : case GREATER : case GREATEREQUAL :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_RELATIONAL );
  				if ( i != setTokens.end() )
  					return true;
--- 346,350 ----
  		case LESS : case LESSEQUAL : case LESSGREATER : case EQUAL : case DOUBLEEQUAL : case NONEQUAL : case GREATER : case GREATEREQUAL :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_RELATIONAL );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 353,357 ****
  		case XOR :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_LOGICAL );
  				if ( i != setTokens.end() )
  					return true;
--- 353,357 ----
  		case XOR :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_LOGICAL );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 360,364 ****
  		case AND : case SC_AND :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_LOGICAL_AND );
  				if ( i != setTokens.end() )
  					return true;
--- 360,364 ----
  		case AND : case SC_AND :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_LOGICAL_AND );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 370,374 ****
  		case OR : case SC_OR :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_LOGICAL_OR );
  				if ( i != setTokens.end() )
  					return true;
--- 370,374 ----
  		case OR : case SC_OR :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_LOGICAL_OR );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 380,384 ****
  		case IMPLIES : case SC_IMPLIES :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_LOGICAL_IMPLIES );
  				if ( i != setTokens.end() )
  					return true;
--- 380,384 ----
  		case IMPLIES : case SC_IMPLIES :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_LOGICAL_IMPLIES );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 390,394 ****
  		case TRUEE: case FALSEE :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_BOOLEAN );
  				if ( i != setTokens.end() )
  					return true;
--- 390,394 ----
  		case TRUEE: case FALSEE :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_BOOLEAN );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 397,401 ****
  		case DOT : case ARROWW :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_CALLKIND );
  				if ( i != setTokens.end() )
  					return true;
--- 397,401 ----
  		case DOT : case ARROWW :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_CALLKIND );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 404,408 ****
  		case PRE : case POST : case DEFATTRIBUTE : case DEFMETHOD :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_PREPOST );
  				if ( i != setTokens.end() )
  					return true;
--- 404,408 ----
  		case PRE : case POST : case DEFATTRIBUTE : case DEFMETHOD :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_PREPOST );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 410,414 ****
  		case INV :
  			{
! 				TokenSet::iterator i = setTokens.find( CLASS_STEREOTYPES );
  				if ( i != setTokens.end() )
  					return true;
--- 410,414 ----
  		case INV :
  			{
! 				TokenSet::const_iterator i = setTokens.find( CLASS_STEREOTYPES );
  				if ( i != setTokens.end() )
  					return true;
***************
*** 416,420 ****
  			}
  	}
! 	TokenSet::iterator i = setTokens.find( iToken );
  	return i != setTokens.end();
  }
--- 416,420 ----
  			}
  	}
! 	TokenSet::const_iterator i = setTokens.find( iToken );
  	return i != setTokens.end();
  }
***************
*** 424,428 ****
  	if ( setTokens2.empty() )
  		return setTokens1.empty();
! 	for ( TokenSet::iterator i = setTokens2.begin() ; i != setTokens2.end() ; ++i )
  		if ( ! Contains( setTokens1, *i ) )
  			return false;
--- 424,428 ----
  	if ( setTokens2.empty() )
  		return setTokens1.empty();
! 	for ( TokenSet::const_iterator i = setTokens2.begin() ; i != setTokens2.end() ; ++i )
  		if ( ! Contains( setTokens1, *i ) )
  			return false;

Index: OCLTypeExBasic.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OCLTypeExBasic.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** OCLTypeExBasic.cpp	13 Oct 2004 15:17:54 -0000	1.18
--- OCLTypeExBasic.cpp	26 Jan 2005 17:28:24 -0000	1.19
***************
*** 10,14 ****
  #include "OCLObjectExBasic.h"
  #include "math.h"
! 
  namespace OclBasic
  {
--- 10,14 ----
  #include "OCLObjectExBasic.h"
  #include "math.h"
! #include "algorithm" // needed for ms stl
  namespace OclBasic
  {

Index: OclConstraint.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/OclConstraint.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OclConstraint.cpp	13 Oct 2004 15:17:54 -0000	1.7
--- OclConstraint.cpp	26 Jan 2005 17:28:24 -0000	1.8
***************
*** 253,257 ****
  			throw m_eState;
  		bool bWasError = false;
! 		for ( OclMeta::DependencySet::iterator i = setDependencies.begin() ; i != setDependencies.end() ; i++ ) {
  			if ( (*i).m_bFailed ) {
  				bWasError = true;
--- 253,257 ----
  			throw m_eState;
  		bool bWasError = false;
! 		for ( OclMeta::DependencySet::const_iterator i = setDependencies.begin() ; i != setDependencies.end() ; i++ ) {
  			if ( (*i).m_bFailed ) {
  				bWasError = true;

Index: Regexp.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/Regexp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Regexp.h	30 Sep 2002 23:19:00 -0000	1.1
--- Regexp.h	26 Jan 2005 17:28:24 -0000	1.2
***************
*** 2,6 ****
  #define __REGEXP_H__
  
! class CString;
  class regexp;
  
--- 2,6 ----
  #define __REGEXP_H__
  
! //class CString; //commented for VC7
  class regexp;
  

Index: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/StdAfx.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StdAfx.cpp	20 Aug 2002 15:40:00 -0000	1.2
--- StdAfx.cpp	26 Jan 2005 17:28:24 -0000	1.3
***************
*** 7,13 ****
  #ifdef _ATL_STATIC_REGISTRY
  #include <statreg.h>
- #include <statreg.cpp>
  #endif
- 
- #include <atlimpl.cpp>
- 
--- 7,9 ----

Index: TreeCtrlEx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/TreeCtrlEx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeCtrlEx.cpp	23 Oct 2002 16:07:00 -0000	1.1
--- TreeCtrlEx.cpp	26 Jan 2005 17:28:24 -0000	1.2
***************
*** 33,37 ****
  #include "stdafx.h"
  #include "TreeCtrlEx.h"
! #include "afximpl.h"
  
  
--- 33,37 ----
  #include "stdafx.h"
  #include "TreeCtrlEx.h"
! #include <afximpl.h>
  
  
***************
*** 70,77 ****
  	// initialize common controls
  	VERIFY(AfxDeferRegisterClass(AFX_WNDCOMMCTL_TREEVIEW_REG));
! 
! 	return CreateEx( dwExStyle, WC_TREEVIEW, NULL, dwStyle,
! 		rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, 
! 		pParentWnd->GetSafeHwnd(), (HMENU)nID );
  }
  
--- 70,81 ----
  	// initialize common controls
  	VERIFY(AfxDeferRegisterClass(AFX_WNDCOMMCTL_TREEVIEW_REG));
! 	//virtual BOOL CreateEx(DWORD dwExStyle, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID);
! 	// changed for VC7's sake
! 	return CreateEx( dwExStyle, /*WC_TREEVIEW, NULL, */
! 		dwStyle, 
! 		rect, //rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
! 		pParentWnd, //pParentWnd->GetSafeHwnd(), 
! 		nID //(HMENU)nID 
! 		);
  }
  

Index: ocl.g
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/ocl.g,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ocl.g	18 May 2004 13:30:58 -0000	1.14
--- ocl.g	26 Jan 2005 17:28:24 -0000	1.15
***************
*** 43,47 ****
  		{	\
  			if ( ! m_ExceptionPool.IsEmpty() ) { \
! 				for ( int iiii = 0 ; iiii < nodes.size() ; iiii++ )	\
  					if ( nodes[ iiii ] )	\
  						delete nodes[ iiii ];	\
--- 43,47 ----
  		{	\
  			if ( ! m_ExceptionPool.IsEmpty() ) { \
! 				for ( unsigned int iiii = 0 ; iiii < nodes.size() ; iiii++ )	\
  					if ( nodes[ iiii ] )	\
  						delete nodes[ iiii ];	\
***************
*** 295,299 ****
  					if ( iCurrent == INPUTEND )
  						return strConsumed;
! 					for ( TokenSet::iterator i = setTokens.begin() ; i != setTokens.end() && bConsumeIt; i++ )
  						switch ( *i ) {
  							case CLASS_MULTIPLICATIVE :	if ( set_el( iCurrent, MULTIPLICATIVE_OPERATORS_set ) ) bConsumeIt = false; break;
--- 295,299 ----
  					if ( iCurrent == INPUTEND )
  						return strConsumed;
! 					for ( TokenSet::const_iterator i = setTokens.begin() ; i != setTokens.end() && bConsumeIt; ++i )
  						switch ( *i ) {
  							case CLASS_MULTIPLICATIVE :	if ( set_el( iCurrent, MULTIPLICATIVE_OPERATORS_set ) ) bConsumeIt = false; break;

Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/ConstraintManager/resource.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** resource.h	18 May 2004 15:13:46 -0000	1.22
--- resource.h	26 Jan 2005 17:28:24 -0000	1.23
***************
*** 1,4 ****
  //{{NO_DEPENDENCIES}}
! // Microsoft Developer Studio generated include file.
  // Used by ConstraintManager.rc
  //
--- 1,4 ----
  //{{NO_DEPENDENCIES}}
! // Microsoft Visual C++ generated include file.
  // Used by ConstraintManager.rc
  //
***************
*** 106,110 ****
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        242
  #define _APS_NEXT_COMMAND_VALUE         32768
  #define _APS_NEXT_CONTROL_VALUE         268
--- 106,110 ----
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        243
  #define _APS_NEXT_COMMAND_VALUE         32768
  #define _APS_NEXT_CONTROL_VALUE         268

--- AFXIMPL.H DELETED ---

--- ConstraintManager.dsp DELETED ---



More information about the GME-commit mailing list