Mercurial > gftp.yaz
comparison src/gtk/misc-gtk.c @ 991:b884506e569c
imported patch rename_dialog
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Thu, 04 Feb 2010 18:02:06 +0900 |
| parents | 936635b76f02 |
| children |
comparison
equal
deleted
inserted
replaced
| 990:a4641b8c68bb | 991:b884506e569c |
|---|---|
| 862 | 862 |
| 863 | 863 |
| 864 static gint | 864 static gint |
| 865 dialog_keypress (GtkWidget * widget, GdkEventKey * event, gpointer data) | 865 dialog_keypress (GtkWidget * widget, GdkEventKey * event, gpointer data) |
| 866 { | 866 { |
| 867 if (event->type != GDK_KEY_PRESS) | 867 switch(event->keyval) { |
| 868 return (FALSE); | 868 case GDK_Return: |
| 869 | 869 case GDK_KP_Enter: |
| 870 if (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return) | 870 if (gtk_im_context_filter_keypress (GTK_ENTRY (widget)->im_context, event)) { |
| 871 { | 871 GTK_ENTRY (widget)->need_im_reset = TRUE; |
| 872 #if GTK_MAJOR_VERSION == 1 | 872 return TRUE; |
| 873 ok_dialog_response (widget, data); | 873 } else { |
| 874 #else | 874 dialog_response (widget, GTK_RESPONSE_YES, data); |
| 875 dialog_response (widget, GTK_RESPONSE_YES, data); | 875 return TRUE; |
| 876 #endif | 876 } |
| 877 return (TRUE); | 877 case GDK_Escape: |
| 878 } | 878 dialog_response (widget, GTK_RESPONSE_NO, data); |
| 879 else if (event->keyval == GDK_Escape) | 879 return TRUE; |
| 880 { | 880 default: |
| 881 #if GTK_MAJOR_VERSION == 1 | 881 return FALSE; |
| 882 cancel_dialog_response (widget, data); | 882 } |
| 883 #else | |
| 884 dialog_response (widget, GTK_RESPONSE_NO, data); | |
| 885 #endif | |
| 886 return (TRUE); | |
| 887 } | |
| 888 | |
| 889 return (FALSE); | |
| 890 } | 883 } |
| 891 | 884 |
| 892 | 885 |
| 893 void | 886 void |
| 894 MakeEditDialog (char *diagtxt, char *infotxt, char *deftext, int passwd_item, | 887 MakeEditDialog (char *diagtxt, char *infotxt, char *deftext, int passwd_item, |