X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a733492856e139253ef8e912b6a5c23d1a12cf57..f31bbefd1070af6162b9deeda9d4e528efbc1b31:/src/gtk/filedlg.cpp diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 20bc8b0558..12439a5e07 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -1,55 +1,56 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/filedlg.cpp +// Name: src/gtk/filedlg.cpp // Purpose: native implementation of wxFileDialog -// Author: Robert Roebling, Zbigniew Zagorski +// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski +// Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "filedlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #if wxUSE_FILEDLG && defined(__WXGTK24__) #include "wx/filedlg.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/filename.h" -#include "wx/msgdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/msgdlg.h" +#endif #include #include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include // chdir -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/filename.h" // wxFilename +#include "wx/tokenzr.h" // wxStringTokenizer +#include "wx/filefn.h" // ::wxGetCwd //----------------------------------------------------------------------------- // "clicked" for OK-button //----------------------------------------------------------------------------- +extern "C" { static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) { - int style = dialog->GetStyle(); - gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); - wxString filename(wxGTK_CONV_BACK(text)); + int style = dialog->GetWindowStyle(); + wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); - if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT)) + // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation) +#if GTK_CHECK_VERSION(2,7,3) + if(gtk_check_version(2,7,3) != NULL) +#endif + if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT)) { - if (wxFileExists(filename)) + if ( g_file_test(filename, G_FILE_TEST_EXISTS) ) { wxString msg; + msg.Printf( - _("File '%s' already exists, do you really want to overwrite it?"), - filename.c_str()); + _("File '%s' already exists, do you really want to overwrite it?"), + wxString(filename, *wxConvFileName)); wxMessageDialog dlg(dialog, msg, _("Confirm"), wxYES_NO | wxICON_QUESTION); @@ -57,45 +58,40 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) return; } } - else if ((style & wxOPEN) && ( style & wxFILE_MUST_EXIST)) + + if (style & wxFD_FILE_MUST_EXIST) { - if (!wxFileExists( filename )) + if ( !g_file_test(filename, G_FILE_TEST_EXISTS) ) { - wxMessageDialog dlg(dialog, - _("Please choose an existing file."), - _("Error"), wxOK | wxICON_ERROR); + wxMessageDialog dlg( dialog, _("Please choose an existing file."), + _("Error"), wxOK| wxICON_ERROR); dlg.ShowModal(); - return; } } - + // change to the directory where the user went if asked - if (style & wxCHANGE_DIR) + if (style & wxFD_CHANGE_DIR) { - wxString cwd; - wxSplitPath(filename, &cwd, NULL, NULL); - - if (cwd != wxGetCwd()) - { - wxSetWorkingDirectory(cwd); - } + // Use chdir to not care about filename encodings + wxGtkString folder(g_path_get_dirname(filename)); + chdir(folder); } - dialog->SetPath(filename); - dialog->UpdateFromDialog(); - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); event.SetEventObject(dialog); dialog->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // "clicked" for Cancel-button //----------------------------------------------------------------------------- -static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w), - wxFileDialog *dialog) +extern "C" +{ + +static void gtk_filedialog_cancel_callback(GtkWidget *w, wxFileDialog *dialog) { wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); event.SetEventObject(dialog); @@ -103,49 +99,87 @@ static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w), } static void gtk_filedialog_response_callback(GtkWidget *w, - int response, + gint response, wxFileDialog *dialog) { - wxapp_install_idle_handler(); - if (response == GTK_RESPONSE_ACCEPT) gtk_filedialog_ok_callback(w, dialog); - else + else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE gtk_filedialog_cancel_callback(w, dialog); } +static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, + gpointer user_data) +{ +#if GTK_CHECK_VERSION(2,4,0) + GtkWidget *preview = GTK_WIDGET(user_data); + + wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser)); + + if ( !filename ) + return; + + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size(filename, 128, 128, NULL); + gboolean have_preview = pixbuf != NULL; + + gtk_image_set_from_pixbuf(GTK_IMAGE(preview), pixbuf); + if ( pixbuf ) + g_object_unref (pixbuf); + + gtk_file_chooser_set_preview_widget_active(chooser, have_preview); +#else + wxUnusedVar(chooser); + wxUnusedVar(user_data); +#endif // GTK+ 2.4+ +} + +} // extern "C" + + //----------------------------------------------------------------------------- // wxFileDialog //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase) +IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog) + +BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog) + EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk) +END_EVENT_TABLE() wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& pos) - : wxFileDialogBase(parent, message, defaultDir, defaultFileName, - wildCard, style, pos) + long style, const wxPoint& pos, + const wxSize& sz, + const wxString& name) + : wxGenericFileDialog(parent, message, defaultDir, defaultFileName, + wildCard, style, pos, sz, name, true ) { - m_needParent = FALSE; + if (gtk_check_version(2,4,0)) + { + wxGenericFileDialog::Create( parent, message, defaultDir, + defaultFileName, wildCard, style, pos ); + return; + } + + parent = GetParentForModalDialog(parent); if (!PreCreation(parent, pos, wxDefaultSize) || !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, - wxDefaultValidator, wxT("filedialog"))) + wxDefaultValidator, wxT("filedialog"))) { wxFAIL_MSG( wxT("wxFileDialog creation failed") ); return; } - bool multiple = (style & wxMULTIPLE) == wxMULTIPLE; GtkFileChooserAction gtk_action; GtkWindow* gtk_parent = NULL; if (parent) - gtk_parent = GTK_WINDOW(parent->m_widget); - - gchar* ok_btn_stock; - if ((style & wxSAVE) == wxSAVE) + gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); + + const gchar* ok_btn_stock; + if ( style & wxFD_SAVE ) { gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE; ok_btn_stock = GTK_STOCK_SAVE; @@ -155,238 +189,349 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN; ok_btn_stock = GTK_STOCK_OPEN; } + 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, - NULL); - - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple); - - gtk_signal_connect(GTK_OBJECT(m_widget), - "response", - GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), - (gpointer*)this); - - m_path = m_dir; - if (!m_path.empty() && m_path.Last() != wxT('/')) - m_path += wxT('/'); - m_path += m_fileName; - SetPath(m_path); - + wxGTK_CONV(m_message), + gtk_parent, + gtk_action, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + ok_btn_stock, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT); + + if ( style & wxFD_MULTIPLE ) + gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true); + + // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically + // destroys the dialog when the user press ESC on the dialog: in that case + // a second call to ShowModal() would result in a bunch of Gtk-CRITICAL + // errors... + g_signal_connect (G_OBJECT(m_widget), + "delete_event", + G_CALLBACK (gtk_widget_hide_on_delete), + (gpointer)this); + + // local-only property could be set to false to allow non-local files to be + // loaded. In that case get/set_uri(s) should be used instead of + // get/set_filename(s) everywhere and the GtkFileChooserDialog should + // probably also be created with a backend, e.g "gnome-vfs", "default", ... + // (gtk_file_chooser_dialog_new_with_backend). Currently local-only is kept + // as the default - true: + // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); + + g_signal_connect (m_widget, "response", + G_CALLBACK (gtk_filedialog_response_callback), this); + SetWildcard(wildCard); - SetFilterIndex(0); + + // if defaultDir is specified it should contain the directory and + // defaultFileName should contain the default name of the file, however if + // directory is not given, defaultFileName contains both + wxFileName fn; + if ( defaultDir.empty() ) + fn.Assign(defaultFileName); + else if ( !defaultFileName.empty() ) + fn.Assign(defaultDir, defaultFileName); + else + fn.AssignDir(defaultDir); + + // set the initial file name and/or directory + fn.MakeAbsolute(); // GTK+ needs absolute path + const wxString dir = fn.GetPath(); + if ( !dir.empty() ) + { + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), + dir.fn_str()); + } + + const wxString fname = fn.GetFullName(); + if ( style & wxFD_SAVE ) + { + if ( !fname.empty() ) + { + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), + fname.fn_str()); + } + +#if GTK_CHECK_VERSION(2,7,3) + if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3)) + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE); +#endif + } + else // wxFD_OPEN + { + if ( !fname.empty() ) + { + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), + fn.GetFullPath().fn_str()); + } + } + +#if GTK_CHECK_VERSION(2,4,0) + if ( style & wxFD_PREVIEW ) + { + GtkWidget *previewImage = gtk_image_new(); + + gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget), + previewImage); + g_signal_connect(m_widget, "update-preview", + G_CALLBACK(gtk_filedialog_update_preview_callback), + previewImage); + } +#endif // GTK+ 2.4+ +} + +void wxFileDialog::OnFakeOk( wxCommandEvent &event ) +{ + if (!gtk_check_version(2,4,0)) + EndDialog(wxID_OK); + else + wxGenericFileDialog::OnListOk( event ); +} + +int wxFileDialog::ShowModal() +{ + if (!gtk_check_version(2,4,0)) + return wxDialog::ShowModal(); + else + return wxGenericFileDialog::ShowModal(); +} + +bool wxFileDialog::Show( bool show ) +{ + if (!gtk_check_version(2,4,0)) + return wxDialog::Show( show ); + else + return wxGenericFileDialog::Show( show ); } -wxFileDialog::~wxFileDialog() +void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags ) { + if (!m_wxwindow) + return; + else + wxGenericFileDialog::DoSetSize( x, y, width, height, sizeFlags ); } -void wxFileDialog::GetFilenames(wxArrayString& files) const +wxString wxFileDialog::GetPath() const { - GetPaths(files); - for (size_t n = 0; n < files.GetCount(); n++ ) + if (!gtk_check_version(2,4,0)) { - wxString name,ext; - wxSplitPath(files[n], NULL, &name, &ext); - if (!ext.IsEmpty()) - { - name += wxT("."); - name += ext; - } - files[n] = name; + wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))); + return wxString(str, *wxConvFileName); } + + return wxGenericFileDialog::GetPath(); } -void wxFileDialog::GetPaths(wxArrayString& paths) const +void wxFileDialog::GetFilenames(wxArrayString& files) const { - paths.Empty(); - if (GetWindowStyle() & wxMULTIPLE) + if (!gtk_check_version(2,4,0)) { - GSList *gpathsi = - gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget)); - GSList *gpaths = gpathsi; - while (gpathsi) + GetPaths(files); + for (size_t n = 0; n < files.GetCount(); ++n ) { - wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data); - paths.Add(file); - g_free(gpathsi->data); - gpathsi = gpathsi->next; + wxFileName file(files[n]); + files[n] = file.GetFullName(); } - if (gpaths) - g_slist_free(gpaths); } else + wxGenericFileDialog::GetFilenames( files ); +} + +void wxFileDialog::GetPaths(wxArrayString& paths) const +{ + if (!gtk_check_version(2,4,0)) { - paths.Add(m_fileName); + paths.Empty(); + if (gtk_file_chooser_get_select_multiple(GTK_FILE_CHOOSER(m_widget))) + { + GSList *gpathsi = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget)); + GSList *gpaths = gpathsi; + while (gpathsi) + { + wxString file((gchar*) gpathsi->data, *wxConvFileName); + paths.Add(file); + g_free(gpathsi->data); + gpathsi = gpathsi->next; + } + + g_slist_free(gpaths); + } + else + paths.Add(GetPath()); } + else + wxGenericFileDialog::GetPaths( paths ); } void wxFileDialog::SetMessage(const wxString& message) { - m_message = message; - SetTitle(message); + if (!gtk_check_version(2,4,0)) + { + m_message = message; + SetTitle(message); + } + else + wxGenericFileDialog::SetMessage( message ); } void wxFileDialog::SetPath(const wxString& path) { - if (path.empty()) return; + if (!gtk_check_version(2,4,0)) + { + if (path.empty()) return; - wxFileName fn(path); - m_path = fn.GetFullPath(); - m_dir = fn.GetPath(); - m_fileName = fn.GetFullName(); - UpdateDialog(); + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), path.fn_str()); + } + else + wxGenericFileDialog::SetPath( path ); } void wxFileDialog::SetDirectory(const wxString& dir) { - if (wxDirExists(dir)) + if (!gtk_check_version(2,4,0)) { - m_dir = dir; - m_path = wxFileName(m_dir, m_fileName).GetFullPath(); - UpdateDialog(); + if (wxDirExists(dir)) + { + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), dir.fn_str()); + } } + else + wxGenericFileDialog::SetDirectory( dir ); } -void wxFileDialog::SetFilename(const wxString& name) +wxString wxFileDialog::GetDirectory() const { - m_fileName = name; - m_path = wxFileName(m_dir, m_fileName).GetFullPath(); - UpdateDialog(); + if (!gtk_check_version(2,4,0)) + { + wxGtkString str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget))); + return wxString(str, *wxConvFileName); + } + + return wxGenericFileDialog::GetDirectory(); } -void wxFileDialog::UpdateDialog() +void wxFileDialog::SetFilename(const wxString& name) { - // set currently selected directory to match the path: - if (!m_dir.empty() && wxDirExists(m_dir)) + if (!gtk_check_version(2,4,0)) { - // NB: This is important -- if we set directory only and not the path, - // then dialog will still remember old path set using previous - // call to gtk_chooser_set_filename. If the previous directory - // was a subdirectory of the directory we want to select now, - // the dialog would still contain directory selector controls - // for the subdirectory (with the parent directory selected), - // instead of showing only the parent directory as expected. - // This way, we force GtkFileChooser to really change the - // directory. Finally, it doesn't have to be done if filename - // is not empty because of the code that sets the filename below. - if (m_fileName.empty()) - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_dir)); - - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_dir)); - } - - // if the user set only the directory (e.g. by calling SetDirectory) - // and not the default filename, then we don't want to set the filename: - if (!m_fileName.empty()) - { - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_path)); - - // pre-fill the filename when saving, too (there's no text entry - // control when opening a file, so it doesn't make sense to - // do this when opening files): - if (GetWindowStyle() & wxSAVE) - { - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), - wxGTK_CONV(m_fileName)); - } + if (HasFdFlag(wxFD_SAVE)) + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name)); + else + SetPath(wxFileName(GetDirectory(), name).GetFullPath()); } + else + wxGenericFileDialog::SetFilename( name ); } -void wxFileDialog::SetWildcard(const wxString& wildCard) +wxString wxFileDialog::GetFilename() const { - m_wildCard = wildCard; - - GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget); - - // empty current filter list: - GSList* ifilters = gtk_file_chooser_list_filters(chooser); - GSList* filters = ifilters; - while (ifilters) - { - gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data)); - ifilters = ifilters->next; - } - g_slist_free(filters); - - // parse filters - wxArrayString wildDescriptions, wildFilters; - if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters)) - { - wxFAIL_MSG( wxT("Wrong file type description") ); - } + if (!gtk_check_version(2,4,0)) + return wxFileName(GetPath()).GetFullName(); else + return wxGenericFileDialog::GetFilename(); +} + +void wxFileDialog::SetWildcard(const wxString& wildCard) +{ + if (!gtk_check_version(2,4,0)) { - // add parsed to GtkChooser - for (size_t n = 0; n < wildFilters.GetCount(); n++) + // parse filters + wxArrayString wildDescriptions, wildFilters; + if (!wxParseCommonDialogsFilter(wildCard, wildDescriptions, wildFilters)) + { + wxFAIL_MSG( wxT("wxFileDialog::SetWildCard - bad wildcard string") ); + } + else { - GtkFileFilter* filter = gtk_file_filter_new(); - gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n])); - wxString after = wildFilters[n]; - do + // Parsing went fine. Set m_wildCard to be returned by wxFileDialogBase::GetWildcard + m_wildCard = wildCard; + + GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget); + + // empty current filter list: + GSList* ifilters = gtk_file_chooser_list_filters(chooser); + GSList* filters = ifilters; + + while (ifilters) { - wxString ext = after.BeforeFirst(wxT(';')); - gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext)); - if (after.Find(wxT(';')) == wxNOT_FOUND) - break; - after = after.AfterLast(wxT(';')); + gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data)); + ifilters = ifilters->next; } - while (!after.empty()); - - gtk_file_chooser_add_filter(chooser, filter); + g_slist_free(filters); + + // add parsed to GtkChooser + for (size_t n = 0; n < wildFilters.GetCount(); ++n) + { + GtkFileFilter* filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, wxGTK_CONV(wildDescriptions[n])); + + wxStringTokenizer exttok(wildFilters[n], wxT(";")); + while (exttok.HasMoreTokens()) + { + wxString token = exttok.GetNextToken(); + gtk_file_filter_add_pattern(filter, wxGTK_CONV(token)); + } + + gtk_file_chooser_add_filter(chooser, filter); + } + + // Reset the filter index + SetFilterIndex(0); } } + else + wxGenericFileDialog::SetWildcard( wildCard ); } void wxFileDialog::SetFilterIndex(int filterIndex) { - m_filterIndex = filterIndex; - GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget); - GSList *fnode = gtk_file_chooser_list_filters(chooser); - GSList *filters = fnode; - int i = 0; - while (fnode) + if (!gtk_check_version(2,4,0)) { - if (i == filterIndex) + gpointer filter; + GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget); + GSList *filters = gtk_file_chooser_list_filters(chooser); + + filter = g_slist_nth_data(filters, filterIndex); + + if (filter != NULL) { - gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data)); - m_filterIndex = i; - break; + gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(filter)); } - i++; - fnode = fnode->next; + else + { + wxFAIL_MSG( wxT("wxFileDialog::SetFilterIndex - bad filter index") ); + } + + g_slist_free(filters); } - g_slist_free(filters); + else + wxGenericFileDialog::SetFilterIndex( filterIndex ); } -void wxFileDialog::UpdateFromDialog() +int wxFileDialog::GetFilterIndex() const { - // update filterIndex - GSList *fnode = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(m_widget)); - GSList *filters = fnode; - GtkFileFilter *current = - gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_widget)); - - int i = 0; - m_filterIndex = 0; - while (fnode) + if (!gtk_check_version(2,4,0)) { - if (fnode->data == (gpointer)current) + GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget); + GtkFileFilter *filter = gtk_file_chooser_get_filter(chooser); + GSList *filters = gtk_file_chooser_list_filters(chooser); + gint index = g_slist_index(filters, filter); + g_slist_free(filters); + + if (index == -1) { - m_filterIndex = i; - break; + wxFAIL_MSG( wxT("wxFileDialog::GetFilterIndex - bad filter index returned by gtk+") ); + return 0; } - i++; - fnode = fnode->next; + else + return index; } - g_slist_free(filters); + else + return wxGenericFileDialog::GetFilterIndex(); } -#endif // wxUSE_FILEDLG && defined(__WXGTK24__) +#endif // wxUSE_FILEDLG && __WXGTK24__