Mercurial > geeqie

diff src/ui_utildlg.c @ 1810:c416d099a3dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK marks several functions as deprecated The following functions has been replaced and deprecated by version 2.20: - GTK_WIDGET_CAN_FOCUS - GTK_WIDGET_DRAWABLE - GTK_WIDGET_HAS_FOCUS - GTK_WIDGET_HAS_GRAB - GTK_WIDGET_IS_SENSITIVE - GTK_WIDGET_NO_WINDOW - GTK_WIDGET_REALIZED - GTK_WIDGET_SENSITIVE - GTK_WIDGET_STATE - GTK_WIDGET_TOPLEVEL - GTK_WIDGET_VISIBLE
author mow
date Mon, 10 May 2010 11:32:56 +0000
parents 3a2aff957816
children
line wrap: on
line diff
--- a/src/ui_utildlg.c	Sun Feb 28 22:55:37 2010 +0000
+++ b/src/ui_utildlg.c	Mon May 10 11:32:56 2010 +0000
@@ -62,7 +62,11 @@
 {
 	GenericDialog *gd = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+	if (event->keyval == GDK_Return && gtk_widget_has_focus(widget)
+#else
 	if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget)
+#endif
 	    && gd->default_cb)
 		{
 		gboolean auto_close;
@@ -234,7 +238,11 @@
 			GtkWidget *top;
 
 			top = gtk_widget_get_toplevel(parent);
+#if GTK_CHECK_VERSION(2,20,0)
+			if (GTK_IS_WINDOW(top) && gtk_widget_is_toplevel(top)) window = GTK_WINDOW(top);
+#else
 			if (GTK_IS_WINDOW(top) && GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top);
+#endif
 			}
 
 		if (window) gtk_window_set_transient_for(GTK_WINDOW(gd->dialog), window);