Mercurial > geeqie
comparison src/ui_utildlg.c @ 1810:c416d099a3dc
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 |
comparison
equal
deleted
inserted
replaced
1809:e1c18f81e637 | 1810:c416d099a3dc |
---|---|
60 | 60 |
61 static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) | 61 static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) |
62 { | 62 { |
63 GenericDialog *gd = data; | 63 GenericDialog *gd = data; |
64 | 64 |
65 #if GTK_CHECK_VERSION(2,20,0) | |
66 if (event->keyval == GDK_Return && gtk_widget_has_focus(widget) | |
67 #else | |
65 if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget) | 68 if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget) |
69 #endif | |
66 && gd->default_cb) | 70 && gd->default_cb) |
67 { | 71 { |
68 gboolean auto_close; | 72 gboolean auto_close; |
69 | 73 |
70 auto_close = gd->auto_close; | 74 auto_close = gd->auto_close; |
232 else | 236 else |
233 { | 237 { |
234 GtkWidget *top; | 238 GtkWidget *top; |
235 | 239 |
236 top = gtk_widget_get_toplevel(parent); | 240 top = gtk_widget_get_toplevel(parent); |
241 #if GTK_CHECK_VERSION(2,20,0) | |
242 if (GTK_IS_WINDOW(top) && gtk_widget_is_toplevel(top)) window = GTK_WINDOW(top); | |
243 #else | |
237 if (GTK_IS_WINDOW(top) && GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top); | 244 if (GTK_IS_WINDOW(top) && GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top); |
245 #endif | |
238 } | 246 } |
239 | 247 |
240 if (window) gtk_window_set_transient_for(GTK_WINDOW(gd->dialog), window); | 248 if (window) gtk_window_set_transient_for(GTK_WINDOW(gd->dialog), window); |
241 } | 249 } |
242 | 250 |