From 5614d24d40375ad409f8f5bcbfdf3c61b61a3555 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 20 Apr 2004 18:52:01 +0000 Subject: [PATCH] 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 --- include/wx/msw/wince/missing.h | 4 +++- src/msw/toplevel.cpp | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h index 1ce4c9624a..99d6ce7583 100644 --- 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 2477c11582..a6799f6d40 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -45,7 +45,10 @@ #if defined(__WXWINCE__) #include #include - #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 #endif #include "wx/msw/wince/missing.h" -- 2.45.2