[PATCH 3/4] gdk-support: get integer types of keypress right. Fixes some keys.

[Jan Nieuwenhuizen]

        * gtk/gnome/gw/gdk-support.c ("gdk-event->vector",
          "vector->gdk-event"): correct integer types of keypress.
---
 gtk/gnome/gw/gdk-support.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk/gnome/gw/gdk-support.c b/gtk/gnome/gw/gdk-support.c
index df28fe9..1501ee9 100644
--- a/gtk/gnome/gw/gdk-support.c
+++ b/gtk/gnome/gw/gdk-support.c
@@ -47,11 +47,11 @@ gdk_event_to_vector (GdkEvent *event)
             VSET (ret, 0, type);
             VSET (ret, 1, scm_c_gtype_instance_to_scm (ekey.window));
             VSET (ret, 2, ekey.send_event ? SCM_BOOL_T : SCM_BOOL_F);
-            VSET (ret, 3, scm_from_ulong (ekey.time));
-            VSET (ret, 4, scm_from_int (ekey.state));
-            VSET (ret, 5, scm_from_int (ekey.keyval));
-            VSET (ret, 6, scm_from_int (ekey.hardware_keycode));
-            VSET (ret, 7, scm_from_int (ekey.group));
+            VSET (ret, 3, scm_from_uint32 (ekey.time));
+            VSET (ret, 4, scm_from_uint (ekey.state));
+            VSET (ret, 5, scm_from_uint (ekey.keyval));
+            VSET (ret, 6, scm_from_uint16 (ekey.hardware_keycode));
+            VSET (ret, 7, scm_from_uint8 (ekey.group));
             return ret;
         }
     case GDK_BUTTON_PRESS:
@@ -303,9 +303,9 @@ vector_to_gdk_event (SCM vec)
        case GDK_KEY_RELEASE:
          event->key.time = scm_to_uint32 (scm_c_vector_ref (vec, 3));
          event->key.state = scm_to_uint (scm_c_vector_ref (vec, 4));
-         event->key.keyval = scm_to_int (scm_c_vector_ref (vec, 5));
-         event->key.hardware_keycode = scm_to_int (scm_c_vector_ref (vec, 6));
-         event->key.group = scm_to_ushort (scm_c_vector_ref (vec, 7));
+         event->key.keyval = scm_to_uint (scm_c_vector_ref (vec, 5));
+         event->key.hardware_keycode = scm_to_uint16 (scm_c_vector_ref (vec, 
6));
+         event->key.group = scm_to_uint8 (scm_c_vector_ref (vec, 7));
          break;
          
        case GDK_ENTER_NOTIFY:
-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl