From c09e27cfb4bc71fe10e87bc53bcece6f77548531 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 12 Dec 2017 04:46:29 -0800 Subject: [PATCH] GTK3/4: GTK_STOCK_CANCEL deprecated, use labels GTK+3 deprecates GTK_STOCK_CANCEL and GTK_STOCK_SAVE etc. and GTK+4 removes them entirely. The API documentation recommends using the strings "Cancel" and "Save" instead, use them (or the appropriate translation.) --- src/gtk/assertdlg_gtk.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index 8f24ef6746..9e9ca9ba76 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -13,6 +13,7 @@ #include #include "wx/gtk/assertdlg_gtk.h" #include "wx/gtk/private/gtk2-compat.h" +#include "wx/translation.h" #include @@ -155,8 +156,8 @@ static void gtk_assert_dialog_save_backtrace_callback(GtkWidget*, GtkAssertDialo dialog = gtk_file_chooser_dialog_new ("Save assert info to file", GTK_WINDOW(dlg), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + static_cast(wxGetTranslation("Cancel").utf8_str()), GTK_RESPONSE_CANCEL, + static_cast(wxGetTranslation("Save").utf8_str()), GTK_RESPONSE_ACCEPT, NULL); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)