Merge branch 'master' into powerpencilII

8 files changed, 59 insertions, 5 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/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 0f0d205e2..318e6ced2 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -792,10 +792,14 @@ static gboolean event_cb( EgeAdjustmentAction* act, GdkEvent* evt )
     if ( evt->type == GDK_BUTTON_PRESS ) {
         if ( evt->button.button == 3 ) {
             if ( IS_EGE_ADJUSTMENT_ACTION(act) ) {
-                GdkEventButton* btnevt = (GdkEventButton*)evt;
                 GtkWidget* menu = create_popup_number_menu(act);
                 gtk_widget_show_all( menu );
+#if GTK_CHECK_VERSION(3,22,0)
+                gtk_menu_popup_at_pointer( GTK_MENU(menu), evt );
+#else
+                GdkEventButton* btnevt = (GdkEventButton*)evt;
                 gtk_menu_popup( GTK_MENU(menu), NULL, NULL, NULL, NULL, btnevt->button, btnevt->time );
+#endif
             }
             handled = TRUE;
         }
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index bc5112a89..688eb2cf0 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -265,7 +265,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);
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 447af9c71..11be3b15d 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1038,11 +1038,19 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
                 swatch->setDesktop( desktop );
                 swatch->setClickVerb( aux_toolboxes[i].swatch_verb_id );
                 swatch->setWatchedTool( aux_toolboxes[i].swatch_tool, true );
+
+#if GTKMM_CHECK_VERSION(3,12,0)
+                swatch->set_margin_start(AUX_BETWEEN_BUTTON_GROUPS);
+                swatch->set_margin_end(AUX_BETWEEN_BUTTON_GROUPS);
+#else
+                swatch->set_margin_left(AUX_BETWEEN_BUTTON_GROUPS);
+                swatch->set_margin_right(AUX_BETWEEN_BUTTON_GROUPS);
+#endif
+
+                swatch->set_margin_top(AUX_SPACING);
+                swatch->set_margin_bottom(AUX_SPACING);
+
                 auto swatch_ = GTK_WIDGET( swatch->gobj() );
-                gtk_widget_set_margin_left(swatch_, AUX_BETWEEN_BUTTON_GROUPS);
-                gtk_widget_set_margin_right(swatch_, AUX_BETWEEN_BUTTON_GROUPS);
-                gtk_widget_set_margin_top(swatch_, AUX_SPACING);
-                gtk_widget_set_margin_bottom(swatch_, AUX_SPACING);
                 gtk_grid_attach( GTK_GRID(holder), swatch_, 1, 0, 1, 1);
             }
             if(i==0){