Index: SDL/src/events/SDL_mouse.c
===================================================================
--- SDL/src/events/SDL_mouse.c	(revision 4546)
+++ SDL/src/events/SDL_mouse.c	(working copy)
@@ -369,6 +369,7 @@
         event.proximity.y = y;
         event.proximity.cursor = mouse->current_end;
         event.proximity.type = type;
+        event.proximity.windowID = mouse->focus;
         posted = (SDL_PushEvent(&event) > 0);
         if (type == SDL_PROXIMITYIN) {
             mouse->proximity = SDL_TRUE;
Index: SDL/include/SDL_events.h
===================================================================
--- SDL/include/SDL_events.h	(revision 4546)
+++ SDL/include/SDL_events.h	(working copy)
@@ -313,6 +313,11 @@
     SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
 } SDL_SysWMEvent;
 
+/**
+ * \struct SDL_ProximityEvent
+ *
+ * \brief An event triggered when the user touches a tablet with a stylus.
+ */
 typedef struct SDL_ProximityEvent
 {
     Uint8 type;
@@ -320,6 +325,7 @@
     int cursor;
     int x;
     int y;
+    SDL_WindowID windowID;
 } SDL_ProximityEvent;
 
 /* Typedefs for backwards compatibility */