Updating with Vadim's API changes.

[wxWidgets.git] / src / gtk / filedlg.cpp

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 7513762b20d3ea6b43f7662d65ce7cae4ed04c3d..6bc006ce84d8fae73c8e07c3e8a0bca8f75685b4 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -1,252 +1,534 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
-// Purpose:
-// Author:      Robert Roebling
+// Name:        src/gtk/filedlg.cpp
+// Purpose:     native implementation of wxFileDialog
+// Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp

 // Id:          $Id$
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling
+// Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#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/filedlg.h"

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/generic/msgdlgg.h"

 
 

-#include "gtk/gtk.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/msgdlg.h"
+#endif

 
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 
 

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <unistd.h> // chdir
+
+#include "wx/filename.h" // wxFilename
+#include "wx/tokenzr.h" // wxStringTokenizer
+#include "wx/filefn.h" // ::wxGetCwd

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// "delete_event"
+// idle system

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-static
-bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-    win->Close();
-
-    return TRUE;
-}
+extern void wxapp_install_idle_handler();

 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 

-static
-void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )
+extern "C" {
+static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    int style = dialog->GetWindowStyle();
+    wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));

 
 

-    int style = dialog->GetStyle();
-
-    GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
-    char *filename = gtk_file_selection_get_filename(filedlg);
-
-    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;
         {
             wxString msg;

-            msg.Printf( _("File '%s' already exists, do you really want to "
-                         "overwrite it?"), filename);

 
 

-            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+            msg.Printf(
+                _("File '%s' already exists, do you really want to overwrite it?"),
+                wxString(wxConvFileName->cMB2WX(filename)).c_str());
+
+            wxMessageDialog dlg(dialog, msg, _("Confirm"),
+                               wxYES_NO | wxICON_QUESTION);
+            if (dlg.ShowModal() != wxID_YES)

                 return;
         }
     }
                 return;
         }
     }

-    else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )
-    {
-        if ( !wxFileExists( filename ) )
-        {
-            wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);

 
 

-            return;
-        }
+    // change to the directory where the user went if asked
+    if (style & wxFD_CHANGE_DIR)
+    {
+        // Use chdir to not care about filename encodings
+        wxGtkString folder(g_path_get_dirname(filename));
+        chdir(folder);

     }
 
     }
 

-    dialog->SetPath( filename );
-

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);

-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    event.SetEventObject(dialog);
+    dialog->GetEventHandler()->ProcessEvent(event);
+}

 }
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 

-static
-void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialog )
+extern "C"

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();

 
 

+static void gtk_filedialog_cancel_callback(GtkWidget *w, wxFileDialog *dialog)
+{

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);

-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    event.SetEventObject(dialog);
+    dialog->GetEventHandler()->ProcessEvent(event);
+}
+
+static void gtk_filedialog_response_callback(GtkWidget *w,
+                                             gint response,
+                                             wxFileDialog *dialog)
+{
+    wxapp_install_idle_handler();
+
+    if (response == GTK_RESPONSE_ACCEPT)
+        gtk_filedialog_ok_callback(w, dialog);
+    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
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
-
-wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
-                            const wxString& defaultDir, const wxString& defaultFileName,
-                            const wxString& wildCard,
-                            long style, const wxPoint& pos )
+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,
+                           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;
+    }
+
+    m_needParent = false;

 
 

-    PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
-    m_message = message;
-    m_path = _T("");
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;
-    m_dialogStyle = style;
-    m_filterIndex = 1;
+    if (!PreCreation(parent, pos, wxDefaultSize) ||
+        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+                wxDefaultValidator, wxT("filedialog")))
+    {
+        wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+        return;
+    }

 
 

-    m_widget = gtk_file_selection_new( m_message.mbc_str() );
+    GtkFileChooserAction gtk_action;
+    GtkWindow* gtk_parent = NULL;
+    if (parent)
+        gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );

 
 

-    int x = (gdk_screen_width () - 400) / 2;
-    int y = (gdk_screen_height () - 400) / 2;
-    gtk_widget_set_uposition( m_widget, x, y );
+    const gchar* ok_btn_stock;
+    if ( style & wxFD_SAVE )
+    {
+        gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
+        ok_btn_stock = GTK_STOCK_SAVE;
+    }
+    else
+    {
+        gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+        ok_btn_stock = GTK_STOCK_OPEN;
+    }

 
 

-    GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
-    gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
+    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_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);
+
+    // 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);
+
+    // set the initial file name and/or directory
+    wxString fname = fn.GetFullName();
+    if ( fname.empty() )
+    {
+        wxString dir = fn.GetPath();
+        if ( !dir.empty() )
+        {
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                                                dir.fn_str());
+        }
+    }

 
 

-    m_path.Append(m_dir);
-    if( ! m_path.IsEmpty() && m_path.Last()!=_T('/') )
-        m_path.Append('/');
-    m_path.Append(m_fileName);
+    if ( style & wxFD_SAVE )
+    {
+        if ( !fname.empty() )
+        {
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+                                              fname.fn_str());
+        }

 
 

-    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path.mbc_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());
+        }
+    }

 
 

-    gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
+#if GTK_CHECK_VERSION(2,4,0)
+    if ( style & wxFD_PREVIEW )
+    {
+        GtkWidget *previewImage = gtk_image_new();

 
 

-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) );
+        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+
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
-      
-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
-    
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+{
+    if (!gtk_check_version(2,4,0))
+        EndDialog(wxID_OK);
+    else
+        wxGenericFileDialog::OnListOk( event );

 }
 
 }
 

-void wxFileDialog::SetPath(const wxString& path)
+int wxFileDialog::ShowModal()

 {
 {

-    // not only set the full path but also update filename and dir
-    m_path = path;
-    if ( !!path )
-    {
-        wxString ext;
-        wxSplitPath(path, &m_dir, &m_fileName, &ext);
-        m_fileName += ext;
-    }
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else
+        return wxGenericFileDialog::ShowModal();

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
+bool wxFileDialog::Show( bool show )
+{
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else
+        return wxGenericFileDialog::Show( show );
+}

 
 

-wxString
-wxFileSelectorEx(const wxChar *message,
-                 const wxChar *default_path,
-                 const wxChar *default_filename,
-                 int *indexDefaultExtension,
-                 const wxChar *wildcard,
-                 int flags,
-                 wxWindow *parent,
-                 int x, int y)
+void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags )

 {
 {

-    // TODO: implement this somehow
-    return wxFileSelector(message, default_path, default_filename, _T(""),
-                          wildcard, flags, parent, x, y);
+    if (!m_wxwindow)
+        return;
+    else
+        wxGenericFileDialog::DoSetSize( x, y, width, height, sizeFlags );

 }
 
 }
 

-wxString wxFileSelector( const wxChar *title,
-                      const wxChar *defaultDir, const wxChar *defaultFileName,
-                      const wxChar *defaultExtension, const wxChar *filter, int flags,
-                      wxWindow *parent, int x, int y )
+wxString wxFileDialog::GetPath() const

 {
 {

-    wxString filter2;
-    if ( defaultExtension && !filter )
-        filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
+    if (!gtk_check_version(2,4,0))
+    {
+        wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+        return wxConvFileName->cMB2WX(str);
+    }

 
 

-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
+    return wxGenericFileDialog::GetPath();
+}

 
 

-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        GetPaths(files);
+        for (size_t n = 0; n < files.GetCount(); ++n )
+        {
+            wxFileName file(files[n]);
+            files[n] = file.GetFullName();
+        }
+    }
+    else
+        wxGenericFileDialog::GetFilenames( files );
+}

 
 

-    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        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(wxConvFileName->cMB2WX((gchar*) gpathsi->data));
+                paths.Add(file);
+                g_free(gpathsi->data);
+                gpathsi = gpathsi->next;
+            }
+
+            g_slist_free(gpaths);
+        }
+        else
+            paths.Add(GetPath());
+    }
+    else
+        wxGenericFileDialog::GetPaths( paths );
+}

 
 

-    if ( fileDialog.ShowModal() == wxID_OK )
+void wxFileDialog::SetMessage(const wxString& message)
+{
+    if (!gtk_check_version(2,4,0))

     {
     {

-        return fileDialog.GetPath();
+        m_message = message;
+        SetTitle(message);

     }
     else
     }
     else

+        wxGenericFileDialog::SetMessage( message );
+}
+
+void wxFileDialog::SetPath(const wxString& path)
+{
+    if (!gtk_check_version(2,4,0))

     {
     {

-        return wxEmptyString;
+        if (path.empty()) return;
+
+        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));

     }
     }

+    else
+        wxGenericFileDialog::SetPath( path );

 }
 
 }
 

-wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent )
+void wxFileDialog::SetDirectory(const wxString& dir)

 {
 {

-    wxChar *ext = (wxChar *)extension;
+    if (!gtk_check_version(2,4,0))
+    {
+        if (wxDirExists(dir))
+        {
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
+        }
+    }
+    else
+        wxGenericFileDialog::SetDirectory( dir );
+}

 
 

-    wxChar prompt[50];
-    wxString str = _("Load %s file");
-    wxSprintf(prompt, str, what);
+wxString wxFileDialog::GetDirectory() const
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        wxGtkString str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget)));
+        return wxConvFileName->cMB2WX(str);
+    }

 
 

-    if (*ext == _T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+    return wxGenericFileDialog::GetDirectory();
+}
+
+void wxFileDialog::SetFilename(const wxString& name)
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        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 );
+}
+
+wxString wxFileDialog::GetFilename() const
+{
+    if (!gtk_check_version(2,4,0))
+        return wxFileName(GetPath()).GetFullName();
+    else
+        return wxGenericFileDialog::GetFilename();
+}

 
 

-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        // parse filters
+        wxArrayString wildDescriptions, wildFilters;
+        if (!wxParseCommonDialogsFilter(wildCard, wildDescriptions, wildFilters))
+        {
+            wxFAIL_MSG( wxT("wxFileDialog::SetWildCard - bad wildcard string") );
+        }
+        else
+        {
+            // 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)
+            {
+                gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
+                ifilters = ifilters->next;
+            }
+            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 );

 }
 
 }
 

-wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
-         wxWindow *parent )
+void wxFileDialog::SetFilterIndex(int filterIndex)

 {
 {

-    wxChar *ext = (wxChar *)extension;

 
 

-    wxChar prompt[50];
-    wxString str = _("Save %s file");
-    wxSprintf(prompt, str, what);
+    if (!gtk_check_version(2,4,0))
+    {
+        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(filter));
+        }
+        else
+        {
+            wxFAIL_MSG( wxT("wxFileDialog::SetFilterIndex - bad filter index") );
+        }
+
+        g_slist_free(filters);
+    }
+    else
+        wxGenericFileDialog::SetFilterIndex( filterIndex );
+}

 
 

-    if (*ext == _T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+int wxFileDialog::GetFilterIndex() const
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        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);

 
 

-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+        if (index == -1)
+        {
+            wxFAIL_MSG( wxT("wxFileDialog::GetFilterIndex - bad filter index returned by gtk+") );
+            return 0;
+        }
+        else
+            return index;
+    }
+    else
+                return wxGenericFileDialog::GetFilterIndex();

 }
 
 }
 

+#endif // wxUSE_FILEDLG &&  __WXGTK24__