diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2016-04-13 12:11:41 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2016-04-13 12:11:41 +0000 |
| commit | c9d41b9a25cdcd58087f37c73f60638cb79bf309 (patch) | |
| tree | 113cca3f56487e7341460e32b82a9207e546923d /src | |
| parent | Fix redraw problems when shrinking and then enlarging the SPCanvas widget. (diff) | |
| download | inkscape-c9d41b9a25cdcd58087f37c73f60638cb79bf309.tar.gz inkscape-c9d41b9a25cdcd58087f37c73f60638cb79bf309.zip | |
Gtk3 compatibility fix. Hackfest 2016
(bzr r14825)
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 19c07075b..fe724a964 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1699,10 +1699,10 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_BOTTOM: if ( gtk_widget_is_ancestor(toolbox, hbox) ) { // Removing a widget can reduce ref count to zero - gtk_object_ref(GTK_OBJECT(toolbox)); + g_object_ref(G_OBJECT(toolbox)); gtk_container_remove(GTK_CONTAINER(hbox), toolbox); gtk_container_add(GTK_CONTAINER(vbox), toolbox); - gtk_object_unref(GTK_OBJECT(toolbox)); + g_object_unref(G_OBJECT(toolbox)); gtk_box_set_child_packing(GTK_BOX(vbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); } ToolboxFactory::setOrientation(toolbox, GTK_ORIENTATION_HORIZONTAL); @@ -1710,10 +1710,10 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_LEFT: case GTK_POS_RIGHT: if ( !gtk_widget_is_ancestor(toolbox, hbox) ) { - gtk_object_ref(GTK_OBJECT(toolbox)); + g_object_ref(G_OBJECT(toolbox)); gtk_container_remove(GTK_CONTAINER(vbox), toolbox); gtk_container_add(GTK_CONTAINER(hbox), toolbox); - gtk_object_unref(GTK_OBJECT(toolbox)); + g_object_unref(G_OBJECT(toolbox)); gtk_box_set_child_packing(GTK_BOX(hbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); if (pos == GTK_POS_LEFT) { gtk_box_reorder_child( GTK_BOX(hbox), toolbox, 0 ); |