Mercurial > geeqie.yaz

comparison src/ui_misc.c @ 1043:5fc64d6252e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced gtk depreceated code.
author bruclik
date Sun, 07 Sep 2008 23:01:30 +0000
parents d22e21bfd2a3
children ea4e0c2df854
comparison
equal deleted inserted replaced
1042:e59a9c96d290 1043:5fc64d6252e7
716 gtk_widget_show(box); 716 gtk_widget_show(box);
717 717
718 return spin; 718 return spin;
719 } 719 }
720 720
721 #if ! GTK_CHECK_VERSION(2,12,0)
722
721 static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data) 723 static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data)
722 { 724 {
723 GtkTooltips *tips = data; 725 GtkTooltips *tips = data;
724 726
725 g_object_unref(G_OBJECT(tips)); 727 g_object_unref(G_OBJECT(tips));
726 } 728 }
727 729
730 #endif
731
728 GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style) 732 GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
729 { 733 {
730 GtkWidget *tbar; 734 GtkWidget *tbar;
735 #if ! GTK_CHECK_VERSION(2,12,0)
731 GtkTooltips *tips; 736 GtkTooltips *tips;
732 737 #endif
738
733 tbar = gtk_toolbar_new(); 739 tbar = gtk_toolbar_new();
734 gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style); 740 gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style);
735 741
736 if (parent_box) 742 if (parent_box)
737 { 743 {
738 gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0); 744 gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0);
739 gtk_widget_show(tbar); 745 gtk_widget_show(tbar);
740 } 746 }
741 747
748 #if ! GTK_CHECK_VERSION(2,12,0)
742 tips = gtk_tooltips_new(); 749 tips = gtk_tooltips_new();
743 750
744 /* take ownership of tooltips */ 751 /* take ownership of tooltips */
745 #ifdef GTK_OBJECT_FLOATING 752 # ifdef GTK_OBJECT_FLOATING
746 /* GTK+ < 2.10 */ 753 /* GTK+ < 2.10 */
747 g_object_ref(G_OBJECT(tips)); 754 g_object_ref(G_OBJECT(tips));
748 gtk_object_sink(GTK_OBJECT(tips)); 755 gtk_object_sink(GTK_OBJECT(tips));
749 #else 756 # else
750 /* GTK+ >= 2.10 */ 757 /* GTK+ >= 2.10 */
751 g_object_ref_sink(G_OBJECT(tips)); 758 g_object_ref_sink(G_OBJECT(tips));
752 #endif 759 # endif
753 760
754 g_object_set_data(G_OBJECT(tbar), "tooltips", tips); 761 g_object_set_data(G_OBJECT(tbar), "tooltips", tips);
755 g_signal_connect(G_OBJECT(tbar), "destroy", 762 g_signal_connect(G_OBJECT(tbar), "destroy",
756 G_CALLBACK(pref_toolbar_destroy_cb), tips); 763 G_CALLBACK(pref_toolbar_destroy_cb), tips);
757 764
758 gtk_tooltips_enable(tips); 765 gtk_tooltips_enable(tips);
766 #endif
759 767
760 return tbar; 768 return tbar;
761 } 769 }
762 770
763 GtkWidget *pref_toolbar_button(GtkWidget *toolbar, 771 GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
797 gtk_container_add(GTK_CONTAINER(toolbar), item); 805 gtk_container_add(GTK_CONTAINER(toolbar), item);
798 gtk_widget_show(item); 806 gtk_widget_show(item);
799 807
800 if (description) 808 if (description)
801 { 809 {
810
811 #if GTK_CHECK_VERSION(2,12,0)
812
813 gtk_widget_set_tooltip_text(GTK_TOOL_ITEM(item), description);
814
815 #else
802 GtkTooltips *tips; 816 GtkTooltips *tips;
803 817
804 tips = g_object_get_data(G_OBJECT(toolbar), "tooltips"); 818 tips = g_object_get_data(G_OBJECT(toolbar), "tooltips");
805 gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), tips, description, NULL); 819 gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), tips, description, NULL);
806 } 820 #endif
821 }
807 822
808 return item; 823 return item;
809 } 824 }
810 825
811 void pref_toolbar_button_set_icon(GtkWidget *button, GtkWidget *widget, const gchar *stock_id) 826 void pref_toolbar_button_set_icon(GtkWidget *button, GtkWidget *widget, const gchar *stock_id)