From da1d45e8bbf568179507435a81b5c02db428c7cd Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 16 Dec 2017 23:54:06 +0100
Subject: [PATCH] Don't use stock items in wxFileDialog

Stock items are deprecated since GTK+ 3.10 so corresponding labels
should be used instead of them.
---
 src/gtk/filedlg.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index c4e43df2b9..91541c7986 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -21,6 +21,7 @@
 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/mnemonics.h"
 
 #ifdef __UNIX__
 #include <unistd.h> // chdir
@@ -213,24 +214,37 @@ bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
     if (parent)
         gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
 
-    const gchar* ok_btn_stock;
+    wxString ok_btn_stock;
     if ( style & wxFD_SAVE )
     {
         gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
+#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
+        ok_btn_stock = wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_SAVE));
+#else
         ok_btn_stock = GTK_STOCK_SAVE;
+#endif // GTK >= 3.10 / < 3.10
     }
     else
     {
         gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
+        ok_btn_stock = wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_OPEN));
+#else
         ok_btn_stock = GTK_STOCK_OPEN;
+#endif // GTK >= 3.10 / < 3.10
     }
 
     m_widget = gtk_file_chooser_dialog_new(
                    wxGTK_CONV(m_message),
                    gtk_parent,
                    gtk_action,
-                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                   ok_btn_stock, GTK_RESPONSE_ACCEPT,
+#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
+                   static_cast<const gchar*>(wxGTK_CONV(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_CANCEL)))),
+#else
+                   GTK_STOCK_CANCEL,
+#endif // GTK >= 3.10 / < 3.10
+                   GTK_RESPONSE_CANCEL,
+                   static_cast<const gchar*>(wxGTK_CONV(ok_btn_stock)), GTK_RESPONSE_ACCEPT,
                    NULL);
     g_object_ref(m_widget);
     GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget);