From 9f3aa0b4e5301740951f38473d77bca32a2d2b53 Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Mon, 11 Dec 2017 02:29:35 -0800
Subject: [PATCH] GTK4: different API for adding dialog button

Support the GTK+4 API for adding buttons to dialogs (via __WXGTK4__):

- set_icon_name() instead of image_new_from_stock()/set_image()

- gtk_box_pack_end() takes only two parameters
---
 src/gtk/assertdlg_gtk.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp
index 9e9ca9ba76..b1f8205e03 100644
--- a/src/gtk/assertdlg_gtk.cpp
+++ b/src/gtk/assertdlg_gtk.cpp
@@ -43,12 +43,20 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
     gtk_widget_set_can_default(button, true);
 
     /* add a stock icon inside it */
+#ifdef __WXGTK4__
+    gtk_button_set_icon_name (GTK_BUTTON (button), stock);
+#else
     GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
     gtk_button_set_image (GTK_BUTTON (button), image);
+#endif
 
     /* add to the given (container) widget */
     if (box)
+#ifdef __WXGTK4__
+        gtk_box_pack_end (box, button);
+#else
         gtk_box_pack_end (box, button, FALSE, TRUE, 8);
+#endif
 
     return button;
 }