summaryrefslogtreecommitdiffstats
path: root/src/widgets/gradient-selector.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-11-14 16:07:45 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-11-14 16:07:45 +0000
commit0d3cb2271366191c5cc414fc1bf8f41aaa046068 (patch)
tree56015cf8999ee17546cdc448b7f9fdae389e0fe5 /src/widgets/gradient-selector.cpp
parentchanges_2012_11_13a.patch (diff)
parentemf import. modify sequence of operations to load file EMF_Illustrator_a4.emf... (diff)
downloadinkscape-0d3cb2271366191c5cc414fc1bf8f41aaa046068.tar.gz
inkscape-0d3cb2271366191c5cc414fc1bf8f41aaa046068.zip
merge from trunk (r11871)
(bzr r11668.1.41)
Diffstat (limited to 'src/widgets/gradient-selector.cpp')
-rw-r--r--src/widgets/gradient-selector.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 2a651544b..33388a0c1 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -249,12 +249,9 @@ void SPGradientSelector::setSpread(SPGradientSpread spread)
}
-GtkWidget *
-sp_gradient_selector_new (void)
+GtkWidget *sp_gradient_selector_new()
{
- SPGradientSelector *sel;
-
- sel = (SPGradientSelector*)g_object_new (SP_TYPE_GRADIENT_SELECTOR, NULL);
+ SPGradientSelector *sel = SP_GRADIENT_SELECTOR(g_object_new (SP_TYPE_GRADIENT_SELECTOR, NULL));
return (GtkWidget *) sel;
}
@@ -361,7 +358,7 @@ void SPGradientSelector::onTreeSelection()
}
if (obj) {
- sp_gradient_selector_vector_set (NULL, (SPGradient*)obj, this);
+ sp_gradient_selector_vector_set (NULL, SP_GRADIENT(obj), this);
}
}
@@ -508,7 +505,7 @@ sp_gradient_selector_add_vector_clicked (GtkWidget */*w*/, SPGradientSelector *s
Glib::ustring old_id = gr->getId();
- gr = (SPGradient *) doc->getObjectByRepr(repr);
+ gr = SP_GRADIENT(doc->getObjectByRepr(repr));
// Rename the new gradients id to be similar to the cloned gradients
rename_id(gr, old_id);