summaryrefslogtreecommitdiffstats
path: root/src/widgets/gradient-vector.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2011-07-02 15:36:54 +0000
committerJon A. Cruz <jon@joncruz.org>2011-07-02 15:36:54 +0000
commit7f9142e88f1770c5e8c344153a17ca0668e60cdc (patch)
tree04756453286f688a531eee825d541544de53f195 /src/widgets/gradient-vector.cpp
parentBe accurate when changing width/height in the toolbar, in case geometric boun... (diff)
downloadinkscape-7f9142e88f1770c5e8c344153a17ca0668e60cdc.tar.gz
inkscape-7f9142e88f1770c5e8c344153a17ca0668e60cdc.zip
Fix problem with merged code where a pointer to a plain C GTK+ object was cast to a pointer to a C++ gtkmm object. Fixes bug 804243.
Fixed bugs: - https://launchpad.net/bugs/804243 (bzr r10404)
Diffstat (limited to 'src/widgets/gradient-vector.cpp')
-rw-r--r--src/widgets/gradient-vector.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 63d4bcee0..bf1c38119 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -562,10 +562,9 @@ static void update_stop_list( GtkWidget *mnu, SPGradient *gradient, SPStop *new_
gtk_widget_show(i);
g_object_set_data(G_OBJECT(i), "stop", stop);
GtkWidget *hb = gtk_hbox_new(FALSE, 4);
- GtkWidget *cpv = GTK_WIDGET(Gtk::manage(
- new Inkscape::UI::Widget::ColorPreview(sp_stop_get_rgba32(stop)))->gobj());
- gtk_widget_show(cpv);
- gtk_container_add( GTK_CONTAINER(hb), cpv );
+ Gtk::Widget *cpv = Gtk::manage(new Inkscape::UI::Widget::ColorPreview(sp_stop_get_rgba32(stop)));
+ cpv->show();
+ gtk_container_add( GTK_CONTAINER(hb), cpv->gobj() );
g_object_set_data( G_OBJECT(i), "preview", cpv );
Inkscape::XML::Node *repr = reinterpret_cast<SPItem *>(sl->data)->getRepr();
GtkWidget *l = gtk_label_new(repr->attribute("id"));