Fix memory leak when a spacer is added, and crash when a window is added before wxSiz...

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index e3b9952413b701231e69ce3bb6456f17c562c3ea..61925cde04bf84eb4764f15b1f8c91f54538b1ca 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -1,22 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
-// Purpose:
-// Author:      Robert Roebling
+// Name:        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"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "filedlggtk.h"

 #endif
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers
+#include "wx/setup.h"
+
+#if wxUSE_FILEDLG
+

 #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"
+#ifdef __WXGTK24__
+
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+
+#include <unistd.h> // chdir
+
+#include "wx/intl.h"
+#include "wx/filename.h" // wxFilename
+#include "wx/tokenzr.h" // wxStringTokenizer
+#include "wx/filefn.h" // ::wxGetCwd
+#include "wx/msgdlg.h" // wxMessageDialog

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -25,213 +41,469 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

-//-----------------------------------------------------------------------------
-// "delete_event"
-//-----------------------------------------------------------------------------
-
-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;
-}
-

 //-----------------------------------------------------------------------------
 // "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->GetStyle();
     int style = dialog->GetStyle();

+    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));

 
 

-    GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->GetHandle());
-    char *filename = gtk_file_selection_get_filename(filedlg);
-
-    if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )
+    if ((style & wxSAVE) && (style & wxOVERWRITE_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 & wxCHANGE_DIR)
+    {
+        // Use chdir to not care about filename encodings
+        gchar* folder = g_path_get_dirname(filename);
+        chdir(folder);
+        g_free(folder);

     }
 
     }
 

-    dialog->SetPath( filename );
+    g_free(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" {
+static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
+                                           wxFileDialog *dialog)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     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);
+}

 }
 
 }
 

+extern "C" {
+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 if (response == GTK_RESPONSE_CANCEL)
+        gtk_filedialog_cancel_callback(w, dialog);
+    else // "delete"
+    {
+        gtk_filedialog_cancel_callback(w, dialog);
+        dialog->m_destroyed_by_delete = true;
+    }
+}
+}
+
+#endif // __WXGTK24__
+

 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 

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

 {
 {

-    m_needParent = FALSE;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        wxASSERT_MSG( !( (style & wxSAVE) && (style & wxMULTIPLE) ), wxT("wxFileDialog - wxMULTIPLE used on a save dialog" ) );
+        m_needParent = false;
+        m_destroyed_by_delete = false;
+
+        if (!PreCreation(parent, pos, wxDefaultSize) ||
+            !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+                    wxDefaultValidator, wxT("filedialog")))
+        {
+            wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+            return;
+        }

 
 

-    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;
+        GtkFileChooserAction gtk_action;
+        GtkWindow* gtk_parent = NULL;
+        if (parent)
+            gtk_parent = GTK_WINDOW(parent->m_widget);

 
 

-    m_widget = gtk_file_selection_new( m_message.mbc_str() );
+        gchar* ok_btn_stock;
+        if ( style & wxSAVE )
+        {
+            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;
+        }

 
 

-    int x = (gdk_screen_width () - 400) / 2;
-    int y = (gdk_screen_height () - 400) / 2;
-    gtk_widget_set_uposition( m_widget, x, y );
+        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);

 
 

-    GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
-    gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
+        if ( style & wxMULTIPLE )
+            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);

 
 

-    m_path.Append(m_dir);
-    if( ! m_path.IsEmpty() && m_path.Last()!=_T('/') )
-        m_path.Append('/');
-    m_path.Append(m_fileName);
+        // 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);

 
 

-    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path.mbc_str());
+        g_signal_connect(G_OBJECT(m_widget), "response",
+            GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), (gpointer)this);

 
 

-    gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
+        SetWildcard(wildCard);

 
 

-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConv_current->cWX2MB(_("OK")) );
+        if ( style & wxSAVE )
+        {
+            if ( !defaultDir.empty() )
+                gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                wxConvFileName->cWX2MB(defaultDir));

 
 

-    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 ), wxConv_current->cWX2MB(_("Cancel")) );
-    
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+                wxConvFileName->cWX2MB(defaultFileName));
+        }
+        else
+        {
+            if ( !defaultFileName.empty() )
+            {
+                wxString dir;
+                if ( defaultDir.empty() )
+                    dir = ::wxGetCwd();
+                else
+                    dir = defaultDir;
+
+                gtk_file_chooser_set_filename(
+                    GTK_FILE_CHOOSER(m_widget),
+                    wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
+            }
+            else if ( !defaultDir.empty() )
+                gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
+                    wxConvFileName->cWX2MB(defaultDir) );
+        }
+    }
+    else
+#endif
+        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );

 }
 
 }
 

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

 {
 {

-    // not only set the full path but also update filename and dir
-    m_path = path;
-    if ( !!path )
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        wxString ext;
-        wxSplitPath(path, &m_dir, &m_fileName, &ext);
-        m_fileName += ext;
+        if (m_destroyed_by_delete)
+            m_widget = NULL;

     }
     }

+#endif

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
+void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        wxDialog::OnOK( event );
+    else
+#endif
+        wxGenericFileDialog::OnListOk( event );
+}

 
 

-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 )
+int wxFileDialog::ShowModal()

 {
 {

-    wxString filter2;
-    if ( defaultExtension && !filter )
-        filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else
+#endif
+        return wxGenericFileDialog::ShowModal();
+}

 
 

-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
+bool wxFileDialog::Show( bool show )
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else
+#endif
+        return wxGenericFileDialog::Show( show );
+}

 
 

-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
+wxString wxFileDialog::GetPath() const
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+    else
+#endif
+        return wxGenericFileDialog::GetPath();
+}

 
 

-    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+#ifdef __WXGTK24__
+    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
+#endif
+        wxGenericFileDialog::GetFilenames( files );
+}
+
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+#ifdef __WXGTK24__
+    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
+#endif
+        wxGenericFileDialog::GetPaths( paths );
+}
+
+void wxFileDialog::SetMessage(const wxString& message)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_message = message;
+        SetTitle(message);
+    }
+    else
+#endif
+        wxGenericFileDialog::SetMessage( message );
+}

 
 

-    if ( fileDialog.ShowModal() == wxID_OK )
+void wxFileDialog::SetPath(const wxString& path)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

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

     }
     else
     }
     else

+#endif
+        wxGenericFileDialog::SetPath( path );
+}
+
+void wxFileDialog::SetDirectory(const wxString& dir)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        return wxEmptyString;
+        if (wxDirExists(dir))
+        {
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
+        }

     }
     }

+    else
+#endif
+        wxGenericFileDialog::SetDirectory( dir );

 }
 
 }
 

-wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent )
+wxString wxFileDialog::GetDirectory() const

 {
 {

-    wxChar *ext = (wxChar *)extension;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxConvFileName->cMB2WX(
+            gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) ) );
+    else
+#endif
+        return wxGenericFileDialog::GetDirectory();
+}

 
 

-    wxChar prompt[50];
-    wxString str = _("Load %s file");
-    wxSprintf(prompt, str, what);
+void wxFileDialog::SetFilename(const wxString& name)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (GetStyle() & wxSAVE)
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name));
+        else
+            SetPath(wxFileName(GetDirectory(), name).GetFullPath());
+    }
+    else
+#endif
+        wxGenericFileDialog::SetFilename( name );
+}

 
 

-    if (*ext == _T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+wxString wxFileDialog::GetFilename() const
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxFileName(
+            wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))) ).GetFullName();
+    else
+#endif
+        return wxGenericFileDialog::GetFilename();
+}

 
 

-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+#ifdef __WXGTK24__
+    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
+#endif
+        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;
+#ifdef __WXGTK24__
+    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);

 
 

-    wxChar prompt[50];
-    wxString str = _("Save %s file");
-    wxSprintf(prompt, str, what);
+        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
+#endif
+        wxGenericFileDialog::SetFilterIndex( filterIndex );
+}

 
 

-    if (*ext == _T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+int wxFileDialog::GetFilterIndex() const
+{
+#ifdef __WXGTK24__
+    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
+#endif
+                return wxGenericFileDialog::GetFilterIndex();

 }
 
 }
 

+#endif // wxUSE_FILEDLG