Revision: 6794 Author: ek.kato Date: Fri Nov 5 07:16:08 2010 Log: * gtk/gtk-im-uim.c - (remove_cur_toplevel) : Support GTK+-2.16 again. - (update_cur_toplevel) : Ditto.
http://code.google.com/p/uim/source/detail?r=6794 Modified: /trunk/gtk/gtk-im-uim.c ======================================= --- /trunk/gtk/gtk-im-uim.c Sat Sep 11 18:26:09 2010 +++ /trunk/gtk/gtk-im-uim.c Fri Nov 5 07:16:08 2010 @@ -319,7 +319,11 @@ static void remove_cur_toplevel() { +#if GTK_CHECK_VERSION(2, 18, 0) if (cur_toplevel && gtk_widget_is_toplevel(cur_toplevel)) { +#else + if (cur_toplevel && GTK_WIDGET_TOPLEVEL(cur_toplevel)) { +#endif if (cur_key_press_handler_id) g_signal_handler_disconnect(cur_toplevel, cur_key_press_handler_id); if (cur_key_release_handler_id) @@ -356,7 +360,11 @@ if (uic->widget) { GtkWidget *toplevel = gtk_widget_get_toplevel(uic->widget); +#if GTK_CHECK_VERSION(2, 18, 0) if (toplevel && gtk_widget_is_toplevel(toplevel)) { +#else + if (toplevel && GTK_WIDGET_TOPLEVEL(toplevel)) { +#endif if (cur_toplevel != toplevel) { remove_cur_toplevel(); cur_toplevel = toplevel;
