--- a/include/SDL_events.h	Thu Jul 29 12:26:59 2010 -0400
+++ b/include/SDL_events.h	Fri Jul 30 23:18:35 2010 +0400
@@ -288,12 +288,14 @@
     Uint32 type;        /**< ::SDL_FINGERMOTION OR 
 			   SDL_FINGERDOWN OR SDL_FINGERUP*/
     Uint32 windowID;    /**< The window with mouse focus, if any */
-    Uint8 touchId;        /**< The touch device id */
+    long touchId;        /**< The touch device id */
+    long fingerId;
     Uint8 state;        /**< The current button state */
-    Uint8 fingerId;
     Uint8 padding1;
-    int x;
-    int y;
+    Uint8 padding2;
+    Uint8 padding3;
+    float x;
+    float y;
     int pressure;
 } SDL_TouchFingerEvent;
 
@@ -305,11 +307,11 @@
 {
     Uint32 type;        /**< ::SDL_TOUCHBUTTONUP OR SDL_TOUCHBUTTONDOWN */
     Uint32 windowID;    /**< The window with mouse focus, if any */
-    Uint8 touchId;        /**< The touch device index */
+    long touchId;        /**< The touch device index */
     Uint8 state;        /**< The current button state */
     Uint8 button;        /**< The button changing state */
     Uint8 padding1;
-
+    Uint8 padding2;
 } SDL_TouchButtonEvent;
 
 
@@ -321,10 +323,7 @@
 {
     Uint32 type;        /**< ::SDL_MULTIGESTURE */
     Uint32 windowID;    /**< The window with mouse focus, if any */
-    Uint8 touchId;        /**< The touch device index */
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
+    long touchId;        /**< The touch device index */
     float dTheta;
     float dDist;
     float x;  //currently 0...1. Change to screen coords?
@@ -336,10 +335,7 @@
 {
     Uint32 type;        /**< ::SDL_DOLLARGESTURE */
     Uint32 windowID;    /**< The window with mouse focus, if any */
-    Uint8 touchId;        /**< The touch device index */
-    Uint8 padding1;
-    Uint8 padding2;
-    Uint8 padding3;
+    long touchId;        /**< The touch device index */
     unsigned long gestureId;
     float error;
   /*