[commit] r2294 - in trunk: GME/GMEView SDK/Decorator Examples/NewSample
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Aug 19 12:56:01 CDT 2013
Author: ksmyth
Date: Mon Aug 19 12:56:01 2013
New Revision: 2294
Log:
Remove more AfxSetAmbientActCtx
Modified:
trunk/GME/GMEView/GMEView.cpp
trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp
Modified: trunk/GME/GMEView/GMEView.cpp
==============================================================================
--- trunk/GME/GMEView/GMEView.cpp Fri Aug 16 19:08:26 2013 (r2293)
+++ trunk/GME/GMEView/GMEView.cpp Mon Aug 19 12:56:01 2013 (r2294)
@@ -21,6 +21,7 @@
BOOL CGMEViewApp::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
@@ -46,6 +47,7 @@
{
AfxSetAmbientActCtx(FALSE);
}
+#endif
BOOL bInit = COleControlModule::InitInstance();
Modified: trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp
==============================================================================
--- trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp Fri Aug 16 19:08:26 2013 (r2293)
+++ trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp Mon Aug 19 12:56:01 2013 (r2294)
@@ -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();
More information about the gme-commit
mailing list