[commit] r2047 - in trunk: Paradigms/MetaGME/MetaDecorator Paradigms/UML/decorator SDK/BON/Common SDK/DecoratorWizard/Templates/1033

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Sep 11 09:23:06 2012
New Revision: 2047

Log:
VS2012 compat

Modified:
   trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp
   trunk/Paradigms/UML/decorator/UMLDecoratorApp.cpp
   trunk/SDK/BON/Common/ComponentDll.cpp
   trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp

Modified: trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp
==============================================================================
--- trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp	Tue Sep 11 09:22:42 2012	(r2046)
+++ trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp	Tue Sep 11 09:23:06 2012	(r2047)
@@ -50,6 +50,7 @@
 
 BOOL CDecoratorApp::InitInstance()
 {
+#if _MSC_VER < 1700
 	// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
 	// MFC module state handling code is changed with VC80.
 	// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -75,6 +76,7 @@
 	{
 		AfxSetAmbientActCtx(FALSE);
 	}
+#endif
 
     _Module.Init(ObjectMap, m_hInstance, &LIBID_DecoratorLib);
     return CWinApp::InitInstance();

Modified: trunk/Paradigms/UML/decorator/UMLDecoratorApp.cpp
==============================================================================
--- trunk/Paradigms/UML/decorator/UMLDecoratorApp.cpp	Tue Sep 11 09:22:42 2012	(r2046)
+++ trunk/Paradigms/UML/decorator/UMLDecoratorApp.cpp	Tue Sep 11 09:23:06 2012	(r2047)
@@ -50,6 +50,7 @@
 
 BOOL CUMLDecoratorApp::InitInstance()
 {
+#if _MSC_VER < 1700
 	// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
 	// MFC module state handling code is changed with VC80.
 	// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -75,6 +76,7 @@
 	{
 		AfxSetAmbientActCtx(FALSE);
 	}
+#endif
 
     _Module.Init(ObjectMap, m_hInstance, &LIBID_UMLDECORATORLib);
     return CWinApp::InitInstance();

Modified: trunk/SDK/BON/Common/ComponentDll.cpp
==============================================================================
--- trunk/SDK/BON/Common/ComponentDll.cpp	Tue Sep 11 09:22:42 2012	(r2046)
+++ trunk/SDK/BON/Common/ComponentDll.cpp	Tue Sep 11 09:23:06 2012	(r2047)
@@ -72,6 +72,7 @@
 
 BOOL CComponentApp::InitInstance()
 {
+#if _MSC_VER < 1700
 	// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
 	// MFC module state handling code is changed with VC80.
 	// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -97,6 +98,7 @@
 	{
 		AfxSetAmbientActCtx(FALSE);
 	}
+#endif
 
 	BOOL success = CWinApp::InitInstance();
 	ASSERT(success == TRUE);

Modified: trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp	Tue Sep 11 09:22:42 2012	(r2046)
+++ trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp	Tue Sep 11 09:23:06 2012	(r2047)
@@ -50,6 +50,7 @@
 
 BOOL CDecoratorApp::InitInstance()
 {
+#if _MSC_VER < 1700
 	// See MSDN example code for CWinApp::InitInstance: http://msdn.microsoft.com/en-us/library/ae6yx0z0.aspx
 	// MFC module state handling code is changed with VC80.
 	// We follow the Microsoft's suggested way, but in case of any trouble the set the
@@ -75,6 +76,7 @@
 	{
 		AfxSetAmbientActCtx(FALSE);
 	}
+#endif
 
     _Module.Init(ObjectMap, m_hInstance, &LIBID_DecoratorLib);
     return CWinApp::InitInstance();