diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-26 17:42:47 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-26 17:42:47 +0000 |
| commit | c1e3ec3ca49342c2aca018e5ed4d1f97ef8eff14 (patch) | |
| tree | 775d05a8c4abf00540ba5684c051ea20d573fc6b | |
| parent | emf output. loosen the tolerance on text positioning (Bug 939688) (diff) | |
| download | inkscape-c1e3ec3ca49342c2aca018e5ed4d1f97ef8eff14.tar.gz inkscape-c1e3ec3ca49342c2aca018e5ed4d1f97ef8eff14.zip | |
Replace deprecated gtk_toolbar_append_widget API
(bzr r11021)
| -rw-r--r-- | src/widgets/gradient-toolbar.cpp | 12 | ||||
| -rw-r--r-- | src/widgets/select-toolbar.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 78af985a1..c5f463121 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -573,7 +573,9 @@ sp_gradient_toolbox_new(SPDesktop *desktop) } gtk_box_pack_start(GTK_BOX(cvbox), cbox, TRUE, FALSE, 0); - gtk_toolbar_append_widget( GTK_TOOLBAR(tbl), cvbox, "", "" ); + GtkToolItem *cvbox_toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(cvbox_toolitem), cvbox); + gtk_toolbar_insert(GTK_TOOLBAR(tbl), cvbox_toolitem, -1); } // TODO replace aux_toolbox_space(tbl, AUX_SPACING); @@ -613,7 +615,9 @@ sp_gradient_toolbox_new(SPDesktop *desktop) } gtk_box_pack_start(GTK_BOX(cvbox), cbox, TRUE, TRUE, 3); - gtk_toolbar_append_widget( GTK_TOOLBAR(tbl), cvbox, "", "" ); + GtkToolItem *cvbox_toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(cvbox_toolitem), cvbox); + gtk_toolbar_insert(GTK_TOOLBAR(tbl), cvbox_toolitem, -1); } @@ -623,7 +627,9 @@ sp_gradient_toolbox_new(SPDesktop *desktop) { GtkWidget *vectors = gr_change_widget (desktop); - gtk_toolbar_append_widget( GTK_TOOLBAR(tbl), vectors, "", "" ); + GtkToolItem *vectors_toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(vectors_toolitem), vectors); + gtk_toolbar_insert(GTK_TOOLBAR(tbl), vectors_toolitem, -1); } gtk_widget_show_all(tbl); diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index 8928c10ec..ecc3cc197 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -548,7 +548,9 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb if ( GTK_IS_BOX(holder) ) { gtk_box_pack_start(GTK_BOX(holder), spw, FALSE, FALSE, 0); } else if ( GTK_IS_TOOLBAR(holder) ) { - gtk_toolbar_append_widget( GTK_TOOLBAR(holder), spw, "Text", "priv" ); + GtkToolItem *spw_toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(spw_toolitem), spw); + gtk_toolbar_insert(GTK_TOOLBAR(holder), spw_toolitem, -1); } else { g_warning("Unexpected holder type"); } diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index a75960fd9..4ea9c9344 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -3082,7 +3082,9 @@ void sp_toolbox_add_label(GtkWidget *tbl, gchar const *title, bool wide) gtk_label_set_markup(GTK_LABEL(l), title); gtk_box_pack_end(GTK_BOX(boxl), l, FALSE, FALSE, 0); if ( GTK_IS_TOOLBAR(tbl) ) { - gtk_toolbar_append_widget( GTK_TOOLBAR(tbl), boxl, "", "" ); + GtkToolItem *boxl_toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(boxl_toolitem), boxl); + gtk_toolbar_insert(GTK_TOOLBAR(tbl), boxl_toolitem, -1); } else { gtk_box_pack_start(GTK_BOX(tbl), boxl, FALSE, FALSE, 0); } |