modules/javafx.graphics/src/main/native-glass/gtk/GlassCommonDialogs.cpp

@@ -110,16 +110,17 @@
         jstring_to_utf_release(env, folder, chooser_folder);
         jstring_to_utf_release(env, title, chooser_title);
         return create_empty_result();
     }
 
-    GtkWidget* chooser = glass_file_chooser_dialog(
-            chooser_title,
-            gdk_window_handle_to_gtk(parent),
+    GtkWidget* chooser = gtk_file_chooser_dialog_new(chooser_title, gdk_window_handle_to_gtk(parent),
             static_cast<GtkFileChooserAction>(chooser_type),
-            (chooser_type == GTK_FILE_CHOOSER_ACTION_OPEN ? GTK_STOCK_OPEN : GTK_STOCK_SAVE)
-            );
+            GTK_STOCK_CANCEL,
+            GTK_RESPONSE_CANCEL,
+            (chooser_type == GTK_FILE_CHOOSER_ACTION_OPEN ? GTK_STOCK_OPEN : GTK_STOCK_SAVE),
+            GTK_RESPONSE_ACCEPT,
+            NULL);
 
     if (chooser_type == GTK_FILE_CHOOSER_ACTION_SAVE) {
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), chooser_filename);
         gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (chooser), TRUE);
     }

@@ -194,16 +195,19 @@
     if (!jstring_to_utf_get(env, title, &chooser_title)) {
         jstring_to_utf_release(env, folder, chooser_folder);
         return NULL;
     }
 
-    GtkWidget* chooser = glass_file_chooser_dialog(
+    GtkWidget* chooser = gtk_file_chooser_dialog_new(
             chooser_title,
             gdk_window_handle_to_gtk(parent),
             GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-            GTK_STOCK_OPEN
-            );
+            GTK_STOCK_CANCEL,
+            GTK_RESPONSE_CANCEL,
+            GTK_STOCK_OPEN,
+            GTK_RESPONSE_ACCEPT,
+            NULL);
 
     if (chooser_folder != NULL) {
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser),
                                             chooser_folder);
     }