Test for SDK in use

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index a6799f6d40c70ba8a1610be434a01c510c3ea4d1..3ad3dc4c45023fa69aea9154dec16c330bb8f6e4 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -45,10 +45,8 @@
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>

-  // FIXME: aygshell.h is in the PocketPC 2003 SDK,
-  // so for which SDK _is_ it missing, and how do we test
-  // for it?
-  #if 1 // _WIN32_WCE < 400
+  // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
+  #if _WIN32_WCE < 400 || !defined(WCE_PLATFORM_STANDARDSDK)

     #include <aygshell.h>
   #endif
 #include "wx/msw/wince/missing.h"
     #include <aygshell.h>
   #endif
 #include "wx/msw/wince/missing.h"


@@ -935,7 +933,8 @@ wxDlgProc(HWND hDlg,
             // for this message, returning TRUE tells system to set focus to
             // the first control in the dialog box, but as we set the focus
             // ourselves, we return FALSE from here as well, so fall through
             // for this message, returning TRUE tells system to set focus to
             // the first control in the dialog box, but as we set the focus
             // ourselves, we return FALSE from here as well, so fall through

-#ifdef __WXWINCE__
+                       // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
+#if defined(__WXWINCE__) && !defined(WCE_PLATFORM_STANDARDSDK)

         {
             SHINITDLGINFO shidi;
             shidi.dwMask = SHIDIM_FLAGS;
         {
             SHINITDLGINFO shidi;
             shidi.dwMask = SHIDIM_FLAGS;