Mercurial > dwindows
comparison gtk/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 | 535e8c19a13d |
children | d81bebc5c8cc |
comparison
equal
deleted
inserted
replaced
1746:76b24619f6fa | 1747:f297d8a63aed |
---|---|
1401 int retval = FALSE; | 1401 int retval = FALSE; |
1402 | 1402 |
1403 if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); | 1403 if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); |
1404 if(work.window) | 1404 if(work.window) |
1405 { | 1405 { |
1406 int (*keypressfunc)(HWND, char, int, int, void *) = work.func; | 1406 int (*keypressfunc)(HWND, char, int, int, void *, char *) = work.func; |
1407 guint32 unichar = gdk_keyval_to_unicode(event->keyval); | |
1408 char utf8[7] = { 0 }; | |
1409 | |
1410 g_unichar_to_utf8(unichar, utf8); | |
1407 | 1411 |
1408 retval = keypressfunc(work.window, *event->string, event->keyval, | 1412 retval = keypressfunc(work.window, *event->string, event->keyval, |
1409 event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK), work.data); | 1413 event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK), work.data, utf8); |
1410 } | 1414 } |
1411 return retval; | 1415 return retval; |
1412 } | 1416 } |
1413 | 1417 |
1414 static gint _generic_event(GtkWidget *widget, gpointer data) | 1418 static gint _generic_event(GtkWidget *widget, gpointer data) |