summaryrefslogtreecommitdiffstats
path: root/src/widgets/rect-toolbar.cpp
diff options
context:
space:
mode:
authorJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-12-27 17:05:55 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-12-27 17:05:55 +0000
commit76aab6da8d642a2e72c0a8e0f38c6994a6e62b35 (patch)
tree047c4f9d208f8cf8b647acec494a2bb7a5d160ec /src/widgets/rect-toolbar.cpp
parentMerge branch 'master' into powerpencilII (diff)
parentStop using deprecated gtk_adjustment_value_changed (diff)
downloadinkscape-76aab6da8d642a2e72c0a8e0f38c6994a6e62b35.tar.gz
inkscape-76aab6da8d642a2e72c0a8e0f38c6994a6e62b35.zip
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/widgets/rect-toolbar.cpp')
-rw-r--r--src/widgets/rect-toolbar.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index de599cbfb..5b7362e09 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -152,12 +152,18 @@ static void sp_rtb_defaults( GtkWidget * /*widget*/, GObject *obj)
adj = GTK_ADJUSTMENT( g_object_get_data(obj, "rx") );
gtk_adjustment_set_value(adj, 0.0);
+
+#if !GTK_CHECK_VERSION(3,18,0)
// this is necessary if the previous value was 0, but we still need to run the callback to change all selected objects
gtk_adjustment_value_changed(adj);
+#endif
adj = GTK_ADJUSTMENT( g_object_get_data(obj, "ry") );
gtk_adjustment_set_value(adj, 0.0);
+
+#if !GTK_CHECK_VERSION(3,18,0)
gtk_adjustment_value_changed(adj);
+#endif
sp_rtb_sensitivize( obj );
}