platform/wm/rhodes/stdafx.h in rhodes-3.1.1 vs platform/wm/rhodes/stdafx.h in rhodes-3.2.0.beta.1
- old
+ new
@@ -85,14 +85,19 @@
#define _ATL_NO_AUTOMATIC_NAMESPACE
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
+#ifndef OS_PLATFORM_MOTCE
// CE COM has no single threaded apartment (everything runs in the MTA).
// Hence we declare we're not concerned about thread safety issues:
#define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA
+#else
+#define SHELL_AYGSHELL
+#endif
+
#include <atlbase.h>
#include <atlcom.h>
#include <atlwin.h>
#include <atlhost.h>
//#include <atlsiface.h>
@@ -117,24 +122,30 @@
#if defined(WIN32_PLATFORM_WFSP) && !defined(_TPCSHELL_H_)
#include <tpcshell.h>
#endif
+#if defined(_WIN32_WCE)
+#include <aygshell.h>
+#pragma comment(lib, "aygshell.lib")
+//#include <tpcshell.h> // Required for SHSendBackToFocusWindow
+#endif // SHELL_AYGSHELL
+
#ifndef OS_PLATFORM_CE
#define _WTL_CE_NO_ZOOMSCROLL
#include <atlwince.h>
#endif //OS_PLATFORM_CE
#undef max
#undef min
//--- ---
#endif
-#if defined (_WIN32_WCE) && !defined( OS_PLATFORM_CE )
-#include <pvdispid.h>
-#include <piedocvw.h>
-#endif
+//#if defined (_WIN32_WCE) && !defined( OS_PLATFORM_CE )
+//#include <pvdispid.h>
+//#include <piedocvw.h>
+//#endif
#include "Macros.h"
#if defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)
@@ -147,14 +158,15 @@
#include "DeviceResolutionAware.h"
#endif
using namespace ATL;
-#ifdef SHELL_AYGSHELL
+/*#ifdef SHELL_AYGSHELL
#include <aygshell.h>
#pragma comment(lib, "aygshell.lib")
#include <tpcshell.h> // Required for SHSendBackToFocusWindow
#endif // SHELL_AYGSHELL
+*/
// TODO: temporary code, until the CE compilers correctly implement the /MT[d], /MD[d] switches, and MFCCE fixes some #pragma issues
#ifdef _DLL // /MD
#if defined(_DEBUG)
#pragma comment(lib, "msvcrtd.lib")