diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c
index a68b4ab..a719cba 100644
--- a/WPrefs.app/editmenu.c
+++ b/WPrefs.app/editmenu.c
@@ -244,13 +244,13 @@ static void handleItemEvents(WMEvent * event, void *data)
 	WEditMenuItem *iPtr = (WEditMenuItem *) data;
 
 	switch (event->type) {
-	case Expose:
+	case WME_EXPOSE:
 		if (event->u.expose.count != 0)
 			break;
 		paintEditMenuItem(iPtr);
 		break;
 
-	case DestroyNotify:
+	case WME_DESTROY:
 		destroyEditMenuItem(iPtr);
 		break;
 	}
@@ -791,11 +791,11 @@ static void handleEvents(WMEvent * event, void *data)
 	WEditMenu *mPtr = (WEditMenu *) data;
 
 	switch (event->type) {
-	case DestroyNotify:
+	case WME_DESTROY:
 		destroyEditMenu(mPtr);
 		break;
 
-	case Expose:
+	case WME_EXPOSE:
 		if (event->u.expose.count == 0)
 			paintMenu(mPtr);
 		break;
@@ -1318,7 +1318,7 @@ static void handleItemClick(WMEvent * event, void *data)
 	WEditMenu *menu = item->parent;
 
 	switch (event->type) {
-	case ButtonPress:
+	case WME_BUTTON_PRESS:
 		selectItem(menu, item);
 
 		if (WMIsDoubleClick(event)) {
@@ -1330,11 +1330,11 @@ static void handleItemClick(WMEvent * event, void *data)
 		menu->dragY = event->u.button.y_root;
 		break;
 
-	case ButtonRelease:
+	case WME_BUTTON_RELEASE:
 		menu->flags.isDragging = 0;
 		break;
 
-	case MotionNotify:
+	case WME_MOTION:
 		if (menu->flags.isDragging) {
 			if (abs(event->u.button.x_root - menu->dragX) > 5
 			    || abs(event->u.button.y_root - menu->dragY) > 5) {