Warning fixes for WinCE.

[wxWidgets.git] / include / wx / msw / wince / missing.h

diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h
index 1ce4c9624ae08a189fd96a43807ad604d2e68991..50eff7a464b4263ebfff55316e3105ce5c421308 100644 (file)
--- a/include/wx/msw/wince/missing.h
+++ b/include/wx/msw/wince/missing.h
@@ -25,7 +25,7 @@ inline BOOL IsIconic( HWND WXUNUSED(hWnd) )
     return FALSE;
 }
 
     return FALSE;
 }
 

-#ifdef WIN32_PLATFORM_PSPC
+#ifdef __POCKETPC__

 #define SM_CXCURSOR             13
 #define SM_CYCURSOR             14
 #endif
 #define SM_CXCURSOR             13
 #define SM_CYCURSOR             14
 #endif


@@ -39,9 +39,11 @@ inline BOOL IsIconic( HWND WXUNUSED(hWnd) )
 #define TBSTYLE_NO_DROPDOWN_ARROW 0x0080
 #endif
 
 #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
 
 // 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
 #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