--- gdk-support.c.~1.29.~	2003-08-05 10:20:39.000000000 +1000
+++ gdk-support.c	2003-08-05 10:32:59.000000000 +1000
@@ -299,6 +299,9 @@
     case GDK_BUTTON_PRESS:
     case GDK_BUTTON_RELEASE:
       return event->button.time;
+    case GDK_ENTER_NOTIFY:
+    case GDK_LEAVE_NOTIFY:
+      return event->crossing.time;
     case GDK_KEY_PRESS:
     case GDK_KEY_RELEASE:
       return event->key.time;
@@ -428,6 +431,9 @@
     case GDK_BUTTON_PRESS:
     case GDK_BUTTON_RELEASE:
       return event->button.state;
+    case GDK_ENTER_NOTIFY:
+    case GDK_LEAVE_NOTIFY:
+      return event->crossing.state;
     case GDK_KEY_PRESS:
     case GDK_KEY_RELEASE:
       return event->key.state;
@@ -458,6 +464,9 @@
     case GDK_BUTTON_PRESS:
     case GDK_BUTTON_RELEASE:
       return event->button.source;
+    case GDK_PROXIMITY_IN:
+    case GDK_PROXIMITY_OUT:
+      return event->proximity.source;
     default:
       return GDK_SOURCE_MOUSE; /* XXX */
     }
@@ -474,6 +483,9 @@
     case GDK_BUTTON_PRESS:
     case GDK_BUTTON_RELEASE:
       return event->button.deviceid;
+    case GDK_PROXIMITY_IN:
+    case GDK_PROXIMITY_OUT:
+      return event->proximity.deviceid;
     default:
       return 0;
     }