comparison gtk3/dw.c @ 1747:f297d8a63aed

Added utf8 parameter to key press callback on GTK2/3.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 13 Jun 2012 19:23:30 +0000
parents 7dd1659c2693
children d81bebc5c8cc
comparison
equal deleted inserted replaced
1746:76b24619f6fa 1747:f297d8a63aed
1255 SignalHandler work = _get_signal_handler(widget, data); 1255 SignalHandler work = _get_signal_handler(widget, data);
1256 int retval = FALSE; 1256 int retval = FALSE;
1257 1257
1258 if(work.window) 1258 if(work.window)
1259 { 1259 {
1260 int (*keypressfunc)(HWND, char, int, int, void *) = work.func; 1260 int (*keypressfunc)(HWND, char, int, int, void *, char *) = work.func;
1261 1261 guint32 unichar = gdk_keyval_to_unicode(event->keyval);
1262 char utf8[7] = { 0 };
1263
1264 g_unichar_to_utf8(unichar, utf8);
1265
1262 retval = keypressfunc(work.window, *event->string, event->keyval, 1266 retval = keypressfunc(work.window, *event->string, event->keyval,
1263 event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK), work.data); 1267 event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK), work.data, utf8);
1264 } 1268 }
1265 return retval; 1269 return retval;
1266 } 1270 }
1267 1271
1268 static gint _generic_event(GtkWidget *widget, gpointer data) 1272 static gint _generic_event(GtkWidget *widget, gpointer data)