Mercurial > geeqie
comparison src/collect-table.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 | 956aab097ea7 |
children |
comparison
equal
deleted
inserted
replaced
1809:e1c18f81e637 | 1810:c416d099a3dc |
---|---|
535 gtk_container_add(GTK_CONTAINER(ct->tip_window), label); | 535 gtk_container_add(GTK_CONTAINER(ct->tip_window), label); |
536 gtk_widget_show(label); | 536 gtk_widget_show(label); |
537 | 537 |
538 gdk_window_get_pointer(NULL, &x, &y, NULL); | 538 gdk_window_get_pointer(NULL, &x, &y, NULL); |
539 | 539 |
540 #if GTK_CHECK_VERSION(2,20,0) | |
541 if (!gtk_widget_get_realized(ct->tip_window)) gtk_widget_realize(ct->tip_window); | |
542 #else | |
540 if (!GTK_WIDGET_REALIZED(ct->tip_window)) gtk_widget_realize(ct->tip_window); | 543 if (!GTK_WIDGET_REALIZED(ct->tip_window)) gtk_widget_realize(ct->tip_window); |
544 #endif | |
541 gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16); | 545 gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16); |
542 gtk_widget_show(ct->tip_window); | 546 gtk_widget_show(ct->tip_window); |
543 } | 547 } |
544 | 548 |
545 static void tip_hide(CollectTable *ct) | 549 static void tip_hide(CollectTable *ct) |
1548 if (info) | 1552 if (info) |
1549 { | 1553 { |
1550 layout_image_set_collection(NULL, ct->cd, info); | 1554 layout_image_set_collection(NULL, ct->cd, info); |
1551 } | 1555 } |
1552 } | 1556 } |
1557 #if GTK_CHECK_VERSION(2,20,0) | |
1558 else if (!gtk_widget_has_focus(ct->listview)) | |
1559 #else | |
1553 else if (!GTK_WIDGET_HAS_FOCUS(ct->listview)) | 1560 else if (!GTK_WIDGET_HAS_FOCUS(ct->listview)) |
1561 #endif | |
1554 { | 1562 { |
1555 gtk_widget_grab_focus(ct->listview); | 1563 gtk_widget_grab_focus(ct->listview); |
1556 } | 1564 } |
1557 break; | 1565 break; |
1558 case MOUSE_BUTTON_RIGHT: | 1566 case MOUSE_BUTTON_RIGHT: |
1714 g_object_set(G_OBJECT(cell), "fixed_width", thumb_width, | 1722 g_object_set(G_OBJECT(cell), "fixed_width", thumb_width, |
1715 "fixed_height", options->thumbnails.max_height, | 1723 "fixed_height", options->thumbnails.max_height, |
1716 "show_text", ct->show_text, NULL); | 1724 "show_text", ct->show_text, NULL); |
1717 } | 1725 } |
1718 } | 1726 } |
1727 #if GTK_CHECK_VERSION(2,20,0) | |
1728 if (gtk_widget_get_realized(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview)); | |
1729 #else | |
1719 if (GTK_WIDGET_REALIZED(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview)); | 1730 if (GTK_WIDGET_REALIZED(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview)); |
1731 #endif | |
1720 } | 1732 } |
1721 | 1733 |
1722 row = -1; | 1734 row = -1; |
1723 work = ct->cd->list; | 1735 work = ct->cd->list; |
1724 while (work) | 1736 while (work) |