Mercurial > geeqie

comparison src/layout_util.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
87 LayoutWindow *lw = data; 87 LayoutWindow *lw = data;
88 gboolean stop_signal = FALSE; 88 gboolean stop_signal = FALSE;
89 gint x = 0; 89 gint x = 0;
90 gint y = 0; 90 gint y = 0;
91 91
92 #if GTK_CHECK_VERSION(2,20,0)
93 if (lw->path_entry && gtk_widget_has_focus(lw->path_entry))
94 #else
92 if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry)) 95 if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry))
96 #endif
93 { 97 {
94 if (event->keyval == GDK_Escape && lw->dir_fd) 98 if (event->keyval == GDK_Escape && lw->dir_fd)
95 { 99 {
96 gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path); 100 gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
97 } 101 }
102 if (gtk_widget_event(lw->path_entry, (GdkEvent *)event)) 106 if (gtk_widget_event(lw->path_entry, (GdkEvent *)event))
103 { 107 {
104 return TRUE; 108 return TRUE;
105 } 109 }
106 } 110 }
111 #if GTK_CHECK_VERSION(2,20,0)
112 if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && gtk_widget_has_focus(lw->vd->view) &&
113 #else
107 if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && GTK_WIDGET_HAS_FOCUS(lw->vd->view) && 114 if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && GTK_WIDGET_HAS_FOCUS(lw->vd->view) &&
115 #endif
108 !layout_key_match(event->keyval) && 116 !layout_key_match(event->keyval) &&
109 gtk_widget_event(lw->vd->view, (GdkEvent *)event)) 117 gtk_widget_event(lw->vd->view, (GdkEvent *)event))
110 { 118 {
111 return TRUE; 119 return TRUE;
112 } 120 }
121 gtk_accel_groups_activate(G_OBJECT(lw->window), event->keyval, event->state)) 129 gtk_accel_groups_activate(G_OBJECT(lw->window), event->keyval, event->state))
122 return TRUE; 130 return TRUE;
123 */ 131 */
124 132
125 if (lw->image && 133 if (lw->image &&
134 #if GTK_CHECK_VERSION(2,20,0)
135 (gtk_widget_has_focus(lw->image->widget) || (lw->tools && widget == lw->window) || lw->full_screen) )
136 #else
126 (GTK_WIDGET_HAS_FOCUS(lw->image->widget) || (lw->tools && widget == lw->window) || lw->full_screen) ) 137 (GTK_WIDGET_HAS_FOCUS(lw->image->widget) || (lw->tools && widget == lw->window) || lw->full_screen) )
138 #endif
127 { 139 {
128 stop_signal = TRUE; 140 stop_signal = TRUE;
129 switch (event->keyval) 141 switch (event->keyval)
130 { 142 {
131 case GDK_Left: case GDK_KP_Left: 143 case GDK_Left: case GDK_KP_Left:
2391 *----------------------------------------------------------------------------- 2403 *-----------------------------------------------------------------------------
2392 */ 2404 */
2393 2405
2394 static gboolean layout_bar_enabled(LayoutWindow *lw) 2406 static gboolean layout_bar_enabled(LayoutWindow *lw)
2395 { 2407 {
2408 #if GTK_CHECK_VERSION(2,20,0)
2409 return lw->bar && gtk_widget_get_visible(lw->bar);
2410 #else
2396 return lw->bar && GTK_WIDGET_VISIBLE(lw->bar); 2411 return lw->bar && GTK_WIDGET_VISIBLE(lw->bar);
2412 #endif
2397 } 2413 }
2398 2414
2399 static void layout_bar_destroyed(GtkWidget *widget, gpointer data) 2415 static void layout_bar_destroyed(GtkWidget *widget, gpointer data)
2400 { 2416 {
2401 LayoutWindow *lw = data; 2417 LayoutWindow *lw = data;
2484 bar_notify_selection(lw->bar, count); 2500 bar_notify_selection(lw->bar, count);
2485 } 2501 }
2486 2502
2487 static gboolean layout_bar_sort_enabled(LayoutWindow *lw) 2503 static gboolean layout_bar_sort_enabled(LayoutWindow *lw)
2488 { 2504 {
2505 #if GTK_CHECK_VERSION(2,20,0)
2506 return lw->bar_sort && gtk_widget_get_visible(lw->bar_sort);
2507 #else
2489 return lw->bar_sort && GTK_WIDGET_VISIBLE(lw->bar_sort); 2508 return lw->bar_sort && GTK_WIDGET_VISIBLE(lw->bar_sort);
2509 #endif
2490 } 2510 }
2491 2511
2492 2512
2493 static void layout_bar_sort_destroyed(GtkWidget *widget, gpointer data) 2513 static void layout_bar_sort_destroyed(GtkWidget *widget, gpointer data)
2494 { 2514 {