[peace-changes] peace/dll/ui.so dumpmessage.c,1.5,1.6

[TAMURA K. <tk...@us...>]

Update of /cvsroot/peace/peace/dll/ui.so
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21688

Modified Files:
	dumpmessage.c 
Log Message:
fix compilation errors with w32api-3.6


Index: dumpmessage.c
===================================================================
RCS file: /cvsroot/peace/peace/dll/ui.so/dumpmessage.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dumpmessage.c	5 Sep 2004 01:38:57 -0000	1.5
+++ dumpmessage.c	30 Jun 2006 03:46:01 -0000	1.6
@@ -573,9 +573,9 @@
 		}
 		WR(" data=0x%lx", lp);
 		break;
-#ifdef WM_IME_REQUEST
 	case WM_IME_REQUEST:	/* 98/2000 */
 		WR("WM_IME_REQUEST");
+#ifdef IMR_CANDIDATEWINDOW
 		switch (wp) {
 		case IMR_CANDIDATEWINDOW:
 			WR(" IMR_CANDIDATEWINDOW");	break;
@@ -594,9 +594,9 @@
 		default:
 			WR(" IMR_unknown(0x%x)", wp);	break;
 		}
+#endif
 		WR(" data=0x%lx", lp);
 		break;
-#endif
 	case WM_IME_SELECT:
 		WR("WM_IME_SELECT select?=%d locale=0x%lx", wp, lp);
 		break;
@@ -1500,45 +1500,45 @@
 		off += write_mk_flags(buf, off, BUFFER_SIZE, wp);
 		WR(" pos=C(%d,%d)", GET_X_LPARAM(lp), GET_Y_LPARAM(lp));
 		break;
-#ifdef WM_XBUTTONDOWN
 	case WM_XBUTTONDOWN:
 		WR("WM_XBUTTONDOWN button=");
+#ifdef XBUTTON1
 		switch (HIWORD(wp)) {
 		case XBUTTON1:	WR("XBUTTON1");	break;
 		case XBUTTON2:	WR("XBUTTON2");	break;
 		default:	WR("unknown(0x%x)", HIWORD(wp));
 		}
+#endif
 		WR(" pressed=");
 		off += write_mk_flags(buf, off, BUFFER_SIZE, LOWORD(wp));
 		WR(" pos=C(%d,%d)", GET_X_LPARAM(lp), GET_Y_LPARAM(lp));
 		break;
-#endif
-#ifdef WM_XBUTTONUP
 	case WM_XBUTTONUP:
 		WR("WM_XBUTTONUP button=");
+#ifdef XBUTTON1
 		switch (HIWORD(wp)) {
 		case XBUTTON1:	WR("XBUTTON1");	break;
 		case XBUTTON2:	WR("XBUTTON2");	break;
 		default:	WR("unknown(0x%x)", HIWORD(wp));
 		}
+#endif
 		WR(" pressed=");
 		off += write_mk_flags(buf, off, BUFFER_SIZE, LOWORD(wp));
 		WR(" pos=C(%d,%d)", GET_X_LPARAM(lp), GET_Y_LPARAM(lp));
 		break;
-#endif
-#ifdef WM_XBUTTONDBLCLK
 	case WM_XBUTTONDBLCLK:
 		WR("WM_XBUTTONDBLCLK button=");
+#ifdef XBUTTON1
 		switch (HIWORD(wp)) {
 		case XBUTTON1:	WR("XBUTTON1");	break;
 		case XBUTTON2:	WR("XBUTTON2");	break;
 		default:	WR("unknown(0x%x)", HIWORD(wp));
 		}
+#endif
 		WR(" pressed=");
 		off += write_mk_flags(buf, off, BUFFER_SIZE, LOWORD(wp));
 		WR(" pos=C(%d,%d)", GET_X_LPARAM(lp), GET_Y_LPARAM(lp));
 		break;
-#endif
 	default:
 		WR("(unknown message %u) w=0x%x l=0x%lx", msg, wp, lp);
 	}