View | Details | Raw Unified | Return to bug 21507
Collapse All | Expand All

(-)a/widget/src/gtk2/nsFilePicker.cpp (+9 lines)
Lines 95-100 typedef GtkWidget* (*_gtk_file_chooser_d Link Here
95
                                                      GtkFileChooserAction action,
95
                                                      GtkFileChooserAction action,
96
                                                      const gchar *first_button_text,
96
                                                      const gchar *first_button_text,
97
                                                      ...);
97
                                                      ...);
98
typedef void (*_gtk_dialog_set_alternative_button_order_fn)(GtkDialog *dialog, gint first_response_id, ...);
98
typedef void (*_gtk_file_chooser_set_select_multiple_fn)(GtkFileChooser* chooser, gboolean truth);
99
typedef void (*_gtk_file_chooser_set_select_multiple_fn)(GtkFileChooser* chooser, gboolean truth);
99
typedef void (*_gtk_file_chooser_set_do_overwrite_confirmation_fn)(GtkFileChooser* chooser, gboolean do_confirm);
100
typedef void (*_gtk_file_chooser_set_do_overwrite_confirmation_fn)(GtkFileChooser* chooser, gboolean do_confirm);
100
typedef void (*_gtk_file_chooser_set_current_name_fn)(GtkFileChooser* chooser, const gchar* name);
101
typedef void (*_gtk_file_chooser_set_current_name_fn)(GtkFileChooser* chooser, const gchar* name);
Lines 119-124 DECL_FUNC_PTR(gtk_file_chooser_get_filen Link Here
119
DECL_FUNC_PTR(gtk_file_chooser_get_uri);
120
DECL_FUNC_PTR(gtk_file_chooser_get_uri);
120
DECL_FUNC_PTR(gtk_file_chooser_get_uris);
121
DECL_FUNC_PTR(gtk_file_chooser_get_uris);
121
DECL_FUNC_PTR(gtk_file_chooser_dialog_new);
122
DECL_FUNC_PTR(gtk_file_chooser_dialog_new);
123
DECL_FUNC_PTR(gtk_dialog_set_alternative_button_order);
122
DECL_FUNC_PTR(gtk_file_chooser_set_select_multiple);
124
DECL_FUNC_PTR(gtk_file_chooser_set_select_multiple);
123
DECL_FUNC_PTR(gtk_file_chooser_set_do_overwrite_confirmation);
125
DECL_FUNC_PTR(gtk_file_chooser_set_do_overwrite_confirmation);
124
DECL_FUNC_PTR(gtk_file_chooser_set_current_name);
126
DECL_FUNC_PTR(gtk_file_chooser_set_current_name);
Lines 214-219 nsFilePicker::LoadSymbolsGTK24() Link Here
214
  GET_LIBGTK_FUNC(gtk_file_chooser_get_uri);
216
  GET_LIBGTK_FUNC(gtk_file_chooser_get_uri);
215
  GET_LIBGTK_FUNC(gtk_file_chooser_get_uris);
217
  GET_LIBGTK_FUNC(gtk_file_chooser_get_uris);
216
  GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new);
218
  GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new);
219
  GET_LIBGTK_FUNC(gtk_dialog_set_alternative_button_order);
217
  GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple);
220
  GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple);
218
  GET_LIBGTK_FUNC_OPT(gtk_file_chooser_set_do_overwrite_confirmation);
221
  GET_LIBGTK_FUNC_OPT(gtk_file_chooser_set_do_overwrite_confirmation);
219
  GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name);
222
  GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name);
Lines 605-610 nsFilePicker::Show(PRInt16 *aReturn) Link Here
605
                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
608
                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
606
                                   accept_button, GTK_RESPONSE_ACCEPT,
609
                                   accept_button, GTK_RESPONSE_ACCEPT,
607
                                   NULL);
610
                                   NULL);
611
612
  _gtk_dialog_set_alternative_button_order(GTK_DIALOG(file_chooser),
613
                                          GTK_RESPONSE_ACCEPT,
614
                                          GTK_RESPONSE_CANCEL,
615
                                          -1);
616
608
  if (mAllowURLs) {
617
  if (mAllowURLs) {
609
    _gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
618
    _gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
610
  }
619
  }

Return to bug 21507