summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2012-10-31 05:45:04 +0000
committerJazzyNico <nicoduf@yahoo.fr>2012-10-31 05:45:04 +0000
commitfae3970752f9c3f710afb6d3627d7402dd0de80f (patch)
treebf2ea0a38409da4c82cc341332b2f4372e6a60ab /src
parentFix for 1068763 : Opening 'File > Document Properties' dirties current document (diff)
downloadinkscape-fae3970752f9c3f710afb6d3627d7402dd0de80f.tar.gz
inkscape-fae3970752f9c3f710afb6d3627d7402dd0de80f.zip
Fix for Bug #1069806 (Inkscape crash in File>Open).
(bzr r11856)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/filedialogimpl-gtkmm.cpp11
-rw-r--r--src/ui/dialog/filedialogimpl-gtkmm.h2
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 1663eb0b6..8c2a7e056 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -141,13 +141,12 @@ bool SVGPreview::setDocument(SPDocument *doc)
//This should remove it from the box, and free resources
if (viewerGtk)
- gtk_widget_destroy(viewerGtk);
-
- viewerGtk = sp_svg_view_widget_new(doc);
- GtkWidget *vbox = (GtkWidget *)gobj();
- gtk_box_pack_start(GTK_BOX(vbox), viewerGtk, TRUE, TRUE, 0);
- gtk_widget_show(viewerGtk);
+ Gtk::Container::remove(*viewerGtk);
+ viewerGtk = Glib::wrap(sp_svg_view_widget_new(doc));
+ Gtk::VBox *vbox = Glib::wrap(gobj());
+ vbox->pack_start(*viewerGtk, TRUE, TRUE, 0);
+ viewerGtk->show();
return true;
}
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 2c22e7367..02841a082 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -121,7 +121,7 @@ private:
/**
* The sp_svg_view widget
*/
- GtkWidget *viewerGtk;
+ Gtk::Widget *viewerGtk;
/**
* are we currently showing the "no preview" image?