diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2017-12-26 23:45:39 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2017-12-26 23:45:39 +0000 |
| commit | e6b171abe975b34ff0c3b4c4899d0c5c56643563 (patch) | |
| tree | de33bc599944e517036b18abd1fe5aa597bad1d2 /src | |
| parent | Fix Gtkmm widget margin deprecation (diff) | |
| download | inkscape-e6b171abe975b34ff0c3b4c4899d0c5c56643563.tar.gz inkscape-e6b171abe975b34ff0c3b4c4899d0c5c56643563.zip | |
Stop using deprecated gtk_adjustment_value_changed
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/arc-toolbar.cpp | 12 | ||||
| -rw-r--r-- | src/widgets/connector-toolbar.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/pencil-toolbar.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/rect-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/spiral-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/star-toolbar.cpp | 12 |
6 files changed, 42 insertions, 0 deletions
diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp index 907285a60..d6bb80850 100644 --- a/src/widgets/arc-toolbar.cpp +++ b/src/widgets/arc-toolbar.cpp @@ -285,11 +285,17 @@ static void sp_arctb_defaults(GtkWidget *, GObject *obj) adj = GTK_ADJUSTMENT( g_object_get_data(obj, "start") ); gtk_adjustment_set_value(adj, 0.0); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif adj = GTK_ADJUSTMENT( g_object_get_data(obj, "end") ); gtk_adjustment_set_value(adj, 0.0); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif spinbutton_defocus(GTK_WIDGET(obj)); } @@ -320,12 +326,18 @@ static void arc_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const * / adj = GTK_ADJUSTMENT( g_object_get_data(tbl, "rx") ); gdouble rx = ge->getVisibleRx(); gtk_adjustment_set_value(adj, Quantity::convert(rx, "px", unit)); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif adj = GTK_ADJUSTMENT( g_object_get_data(tbl, "ry") ); gdouble ry = ge->getVisibleRy(); gtk_adjustment_set_value(adj, Quantity::convert(ry, "px", unit)); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif } gdouble start = 0.; diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp index 9c4980f4c..349163255 100644 --- a/src/widgets/connector-toolbar.cpp +++ b/src/widgets/connector-toolbar.cpp @@ -267,7 +267,10 @@ static void connector_tb_event_attr_changed(Inkscape::XML::Node *repr, sp_repr_get_double(repr, "inkscape:connector-spacing", &spacing); gtk_adjustment_set_value(adj, spacing); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif spinbutton_defocus(tbl); } diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index ea7411285..88b54c24e 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -263,7 +263,10 @@ static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GObject *obj) adj = GTK_ADJUSTMENT(g_object_get_data(obj, "tolerance")); gtk_adjustment_set_value(adj, tolerance); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif spinbutton_defocus(tbl); } 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 ); } diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp index ef9f5bce8..a2d5ec44e 100644 --- a/src/widgets/spiral-toolbar.cpp +++ b/src/widgets/spiral-toolbar.cpp @@ -126,7 +126,10 @@ static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GObject *obj) adj = GTK_ADJUSTMENT(g_object_get_data(obj, "revolution")); gtk_adjustment_set_value(adj, rev); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif adj = GTK_ADJUSTMENT(g_object_get_data(obj, "expansion")); gtk_adjustment_set_value(adj, exp); @@ -134,7 +137,10 @@ static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GObject *obj) adj = GTK_ADJUSTMENT(g_object_get_data(obj, "t0")); gtk_adjustment_set_value(adj, t0); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif spinbutton_defocus(tbl); } diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp index 657b38f18..13c4440ca 100644 --- a/src/widgets/star-toolbar.cpp +++ b/src/widgets/star-toolbar.cpp @@ -417,19 +417,31 @@ static void sp_stb_defaults( GtkWidget * /*widget*/, GObject *dataKludge ) adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "magnitude" ) ); gtk_adjustment_set_value(adj, mag); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "proportion" ) ); gtk_adjustment_set_value(adj, prop); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "rounded" ) ); gtk_adjustment_set_value(adj, rounded); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif adj = GTK_ADJUSTMENT( g_object_get_data( dataKludge, "randomized" ) ); gtk_adjustment_set_value(adj, randomized); + +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(adj); +#endif } static void star_toolbox_watch_ec(SPDesktop* dt, Inkscape::UI::Tools::ToolBase* ec, GObject* holder); |
