Compile fix for eVC++ 4 with PocketPC 2003

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

diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h
index 1ce4c9624ae08a189fd96a43807ad604d2e68991..99d6ce7583f7950e190843b99f55522e974d6fa3 100644 (file)
--- a/include/wx/msw/wince/missing.h
+++ b/include/wx/msw/wince/missing.h
@@ -39,9 +39,11 @@ inline BOOL IsIconic( HWND WXUNUSED(hWnd) )
 #define TBSTYLE_NO_DROPDOWN_ARROW 0x0080
 #endif
 
-#if _WIN32_WCE >= 400
+#if _WIN32_WCE >= 400 && !defined(SHCMBM_GETMENU)
 
 // aygshell.h missing from eVC 4 for some reason
+// NB not missing from Pocket PC 2003, hence the test for SHCMBM_GETMENU
+
 #define SHCMBM_GETMENU      (WM_USER + 402)
 #define SHCMBM_SETSUBMENU   (WM_USER + 400) // wparam == id of button, lParam == hmenu, return is old hmenu
 #define SHCMBM_GETSUBMENU   (WM_USER + 401) // lParam == ID

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 2477c11582ca13d16df1397e6537b6cc036e5782..a6799f6d40c70ba8a1610be434a01c510c3ea4d1 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -45,7 +45,10 @@
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>
-  #if _WIN32_WCE < 400
+  // 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
     #include <aygshell.h>
   #endif
 #include "wx/msw/wince/missing.h"