Mercurial > geeqie

comparison src/pan-view.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 956aab097ea7
children
comparison
equal deleted inserted replaced
1809:e1c18f81e637 1810:c416d099a3dc
1210 gint on_entry; 1210 gint on_entry;
1211 1211
1212 pr = PIXBUF_RENDERER(pw->imd->pr); 1212 pr = PIXBUF_RENDERER(pw->imd->pr);
1213 fd = pan_menu_click_fd(pw); 1213 fd = pan_menu_click_fd(pw);
1214 1214
1215 #if GTK_CHECK_VERSION(2,20,0)
1216 focused = (pw->fs || gtk_widget_has_focus(GTK_WIDGET(pw->imd->widget)));
1217 on_entry = (gtk_widget_has_focus(pw->path_entry) ||
1218 gtk_widget_has_focus(pw->search_entry));
1219 #else
1215 focused = (pw->fs || GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(pw->imd->widget))); 1220 focused = (pw->fs || GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(pw->imd->widget)));
1216 on_entry = (GTK_WIDGET_HAS_FOCUS(pw->path_entry) || 1221 on_entry = (GTK_WIDGET_HAS_FOCUS(pw->path_entry) ||
1217 GTK_WIDGET_HAS_FOCUS(pw->search_entry)); 1222 GTK_WIDGET_HAS_FOCUS(pw->search_entry));
1223 #endif
1218 1224
1219 if (focused) 1225 if (focused)
1220 { 1226 {
1221 stop_signal = TRUE; 1227 stop_signal = TRUE;
1222 switch (event->keyval) 1228 switch (event->keyval)
1965 static void pan_search_toggle_cb(GtkWidget *button, gpointer data) 1971 static void pan_search_toggle_cb(GtkWidget *button, gpointer data)
1966 { 1972 {
1967 PanWindow *pw = data; 1973 PanWindow *pw = data;
1968 gboolean visible; 1974 gboolean visible;
1969 1975
1976 #if GTK_CHECK_VERSION(2,20,0)
1977 visible = gtk_widget_get_visible(pw->search_box);
1978 #else
1970 visible = GTK_WIDGET_VISIBLE(pw->search_box); 1979 visible = GTK_WIDGET_VISIBLE(pw->search_box);
1980 #endif
1971 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)) == visible) return; 1981 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)) == visible) return;
1972 1982
1973 if (visible) 1983 if (visible)
1974 { 1984 {
1975 gtk_widget_hide(pw->search_box); 1985 gtk_widget_hide(pw->search_box);
1987 { 1997 {
1988 if (pw->fs) return; 1998 if (pw->fs) return;
1989 1999
1990 if (enable) 2000 if (enable)
1991 { 2001 {
2002 #if GTK_CHECK_VERSION(2,20,0)
2003 if (gtk_widget_get_visible(pw->search_box))
2004 #else
1992 if (GTK_WIDGET_VISIBLE(pw->search_box)) 2005 if (GTK_WIDGET_VISIBLE(pw->search_box))
2006 #endif
1993 { 2007 {
1994 gtk_widget_grab_focus(pw->search_entry); 2008 gtk_widget_grab_focus(pw->search_entry);
1995 } 2009 }
1996 else 2010 else
1997 { 2011 {
1998 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pw->search_button), TRUE); 2012 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pw->search_button), TRUE);
1999 } 2013 }
2000 } 2014 }
2001 else 2015 else
2002 { 2016 {
2017 #if GTK_CHECK_VERSION(2,20,0)
2018 if (gtk_widget_get_visible(pw->search_entry))
2019 #else
2003 if (GTK_WIDGET_VISIBLE(pw->search_entry)) 2020 if (GTK_WIDGET_VISIBLE(pw->search_entry))
2004 { 2021 #endif
2022 {
2023 #if GTK_CHECK_VERSION(2,20,0)
2024 if (gtk_widget_has_focus(pw->search_entry))
2025 #else
2005 if (GTK_WIDGET_HAS_FOCUS(pw->search_entry)) 2026 if (GTK_WIDGET_HAS_FOCUS(pw->search_entry))
2027 #endif
2006 { 2028 {
2007 gtk_widget_grab_focus(GTK_WIDGET(pw->imd->widget)); 2029 gtk_widget_grab_focus(GTK_WIDGET(pw->imd->widget));
2008 } 2030 }
2009 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pw->search_button), FALSE); 2031 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pw->search_button), FALSE);
2010 } 2032 }