* include/winuser.h (WM_IME_*): Remove. Defined in imm.h.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 335612d..6633721 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+       * include/winuser.h (WM_IME_*): Remove. Defined in imm.h.
+
 2006-04-05  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
        * include/iphlpapi.h (GAA_FLAG_*): Define.

diff --git a/winsup/w32api/include/imm.h b/winsup/w32api/include/imm.h
index 7748760..4fb6905 100644 (file)
--- a/winsup/w32api/include/imm.h
+++ b/winsup/w32api/include/imm.h
@@ -20,7 +20,7 @@ extern "C" {
 #define WM_IME_CHAR 0x286
 #define WM_IME_KEYDOWN 0x290
 #define WM_IME_KEYUP 0x291
-#if (WINVER >= 0x0500)
+#if (_WIN32_WINNT >= 0x0500)
 #define WM_IME_REQUEST 0x0288
 #endif
 #define IMC_GETCANDIDATEPOS 7

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index abc8f81..63fc1e4 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1489,22 +1489,6 @@ extern "C" {
 #endif
 #define WM_MOUSEHOVER  0x2A1
 #define WM_MOUSELEAVE  0x2A3
-#if (WINVER >= 0x0400)
-#define WM_IME_CHAR 0x0286
-#define WM_IME_COMPOSITION 0x010F
-#define WM_IME_COMPOSITIONFULL 0x0284
-#define WM_IME_CONTROL 0x0283
-#define WM_IME_ENDCOMPOSITION 0x010E
-#define WM_IME_KEYDOWN 0x0290
-#define WM_IME_KEYUP 0x0291
-#define WM_IME_NOTIFY 0x0282
-#define WM_IME_SELECT 0x0285
-#define WM_IME_SETCONTEXT 0x0281
-#define WM_IME_STARTCOMPOSITION 0x010D
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-#define WM_IME_REQUEST 0x0288
-#endif
 #if (_WIN32_WINNT >= 0x0400)
 #define WHEEL_DELTA 120
 #define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam))