From e6fa5577b603adafab1803d20cf7aeeb06eda986 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 27 Jan 2008 18:50:37 +0000 Subject: [PATCH] (gtk) #659 replace deprecated gtk+ API calls --- gtk/hig.c | 6 +++--- gtk/makemeta-ui.c | 2 +- gtk/msgwin.c | 2 +- gtk/torrent-inspector.c | 14 +++++++------- gtk/tr_window.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gtk/hig.c b/gtk/hig.c index 6f3104485..45e5bad15 100644 --- a/gtk/hig.c +++ b/gtk/hig.c @@ -27,7 +27,7 @@ hig_workarea_add_section_divider (GtkWidget * table, int * row) { GtkWidget * w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, 0u, 6u); + gtk_widget_set_size_request (w, 0u, 6u); gtk_table_attach (GTK_TABLE(table), w, 0, 4, *row, *row+1, 0, 0, 0, 0); ++*row; } @@ -57,12 +57,12 @@ hig_workarea_add_section_spacer (GtkWidget * table, /* spacer to move the fields a little to the right of the name header */ w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, 18u, 0u); + gtk_widget_set_size_request (w, 18u, 0u); gtk_table_attach (GTK_TABLE(table), w, 0, 1, row, row+items_in_section, 0, 0, 0, 0); /* spacer between the controls and their labels */ w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, 12u, 0u); + gtk_widget_set_size_request (w, 12u, 0u); gtk_table_attach (GTK_TABLE(table), w, 2, 3, row, row+items_in_section, 0, 0, 0, 0); } diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c index 7c05b3c36..6d42c8398 100644 --- a/gtk/makemeta-ui.c +++ b/gtk/makemeta-ui.c @@ -270,7 +270,7 @@ make_meta_ui( GtkWindow * parent, tr_handle * handle ) w = ui->pieces_lb = gtk_label_new (NULL); gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 ); w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, 2 * GUI_PAD_BIG, 0); + gtk_widget_set_size_request (w, 2 * GUI_PAD_BIG, 0); gtk_box_pack_start_defaults ( GTK_BOX(h), w ); hig_workarea_add_row (t, &row, "", h, NULL); diff --git a/gtk/msgwin.c b/gtk/msgwin.c index 50d7e0d85..bad1804e0 100644 --- a/gtk/msgwin.c +++ b/gtk/msgwin.c @@ -260,7 +260,7 @@ msgwin_create( TrCore * core ) NULL, NULL, NULL, NULL); w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f ); - gtk_widget_set_usize( w, GUI_PAD_SMALL, GUI_PAD_SMALL ); + gtk_widget_set_size_request( w, GUI_PAD_SMALL, GUI_PAD_SMALL ); gtk_toolbar_append_element( GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_WIDGET, w, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/gtk/torrent-inspector.c b/gtk/torrent-inspector.c index d6343dcea..283f44e78 100644 --- a/gtk/torrent-inspector.c +++ b/gtk/torrent-inspector.c @@ -598,20 +598,20 @@ static GtkWidget* peer_page_new ( TrTorrent * gtor ) gtk_box_pack_start (GTK_BOX(vbox), l, FALSE, FALSE, 0); w = da = p->completeness = gtk_drawing_area_new (); - gtk_widget_set_usize (w, 0u, 100u); + gtk_widget_set_size_request (w, 0u, 100u); g_object_set_data (G_OBJECT(w), "draw-mode", GINT_TO_POINTER(DRAW_AVAIL)); g_signal_connect (w, "expose-event", G_CALLBACK(refresh_pieces), gtor); h = gtk_hbox_new (FALSE, GUI_PAD); w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, GUI_PAD_BIG, 0); + gtk_widget_set_size_request (w, GUI_PAD_BIG, 0); gtk_box_pack_start (GTK_BOX(h), w, FALSE, FALSE, 0); gtk_box_pack_start_defaults (GTK_BOX(h), da); gtk_box_pack_start (GTK_BOX(vbox), h, FALSE, FALSE, 0); /* a small vertical spacer */ w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, 0u, GUI_PAD); + gtk_widget_set_size_request (w, 0u, GUI_PAD); gtk_box_pack_start (GTK_BOX(vbox), w, FALSE, FALSE, 0); g_snprintf (name, sizeof(name), "%s", _("Connected Peers")); @@ -622,14 +622,14 @@ static GtkWidget* peer_page_new ( TrTorrent * gtor ) h = gtk_hbox_new (FALSE, GUI_PAD); w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, GUI_PAD_BIG, 0); + gtk_widget_set_size_request (w, GUI_PAD_BIG, 0); gtk_box_pack_start (GTK_BOX(h), w, FALSE, FALSE, 0); gtk_box_pack_start_defaults (GTK_BOX(h), sw); gtk_box_pack_start_defaults (GTK_BOX(vbox), h); hbox = gtk_hbox_new (FALSE, GUI_PAD); w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); - gtk_widget_set_usize (w, GUI_PAD_BIG, 0); + gtk_widget_set_size_request (w, GUI_PAD_BIG, 0); gtk_box_pack_start (GTK_BOX(hbox), w, FALSE, FALSE, 0); g_snprintf (name, sizeof(name), "%s:", _("Seeders")); l = gtk_label_new (NULL); @@ -886,7 +886,7 @@ activity_page_new (TrTorrent * gtor) hig_workarea_add_row (t, &row, _("Error:"), l, NULL); w = a->availability_da = gtk_drawing_area_new (); - gtk_widget_set_usize (w, 0u, 100u); + gtk_widget_set_size_request (w, 0u, 100u); g_object_set_data (G_OBJECT(w), "draw-mode", GINT_TO_POINTER(DRAW_PROG)); g_signal_connect (w, "expose-event", G_CALLBACK(refresh_pieces), gtor); hig_workarea_add_row (t, &row, _("Completeness:"), w, NULL); @@ -1336,7 +1336,7 @@ file_page_new ( TrTorrent * gtor ) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scroll), GTK_SHADOW_IN); gtk_container_add( GTK_CONTAINER( scroll ), view ); - gtk_widget_set_usize (scroll, 0u, 200u); + gtk_widget_set_size_request (scroll, 0u, 200u); gtk_container_set_border_width (GTK_CONTAINER(scroll), GUI_PAD); ret = scroll; diff --git a/gtk/tr_window.c b/gtk/tr_window.c index c88c94f9c..6576ff2d9 100644 --- a/gtk/tr_window.c +++ b/gtk/tr_window.c @@ -516,14 +516,14 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core ) w = gtk_image_new_from_stock( GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU ); gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 ); w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f ); - gtk_widget_set_usize( w, GUI_PAD, 0u ); + gtk_widget_set_size_request( w, GUI_PAD, 0u ); gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 ); w = p->dl_lb = gtk_label_new( NULL ); gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 ); w = gtk_image_new_from_stock( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU ); gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 ); w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f ); - gtk_widget_set_usize( w, GUI_PAD, 0u ); + gtk_widget_set_size_request( w, GUI_PAD, 0u ); gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 ); w = p->stats_lb = gtk_label_new( NULL ); gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );