Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK4: different API for adding dialog button

Browse Source 
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
This commit is contained in:
Rafael Kitover
2017-12-11 02:29:35 -08:00
committed by paulcor
parent c09e27cfb4
commit 9f3aa0b4e5
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/assertdlg_gtk.cpp
View File

@@ -43,12 +43,20 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
gtk_widget_set_can_default(button, true); gtk_widget_set_can_default(button, true);
/* add a stock icon inside it */ /* 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); GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), image); gtk_button_set_image (GTK_BUTTON (button), image);
#endif
/* add to the given (container) widget */ /* add to the given (container) widget */
if (box) if (box)
#ifdef __WXGTK4__
gtk_box_pack_end (box, button);
#else
gtk_box_pack_end (box, button, FALSE, TRUE, 8); gtk_box_pack_end (box, button, FALSE, TRUE, 8);
#endif
return button; return button;
} }