applied part of patch 1169925: fix errors with multibyte <-> wx conversions

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 65552158fdb83d11a2157b50512ebe157e5a6c06..1240658ca2cdab2ede48d2971d7484f1a338cc98 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -1,22 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

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

 // 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"
+
+#if wxUSE_FILEDLG
+

 #include "wx/filedlg.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/filedlg.h"
 #include "wx/utils.h"
 #include "wx/intl.h"

-#include "wx/generic/msgdlgg.h"
+#include "wx/filename.h"
+#include "wx/msgdlg.h"
+#include "wx/log.h"
+
+#include <gtk/gtk.h>

 
 

-#include "gtk/gtk.h"
+#ifdef __WXGTK24__
+#include "wx/gtk/private.h"

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


@@ -25,238 +35,489 @@
 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* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+    wxString filename(wxGTK_CONV_BACK(text));
+    if ( filename.empty() )
+    {
+        // this is totally lame but better than silent error
+        wxLogWarning(_("This filename can't be used by wxWidgets because it contains invalid UTF-8 characters, please rename the file."));
+        return;
+    }

 
 

-    GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
-    char *filename = gtk_file_selection_get_filename(filedlg);
-
-    if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )
+    if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))

     {
     {

-        if (wxFileExists( filename ))
+        if (wxFileExists(filename))

         {
             wxString msg;
         {
             wxString msg;

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

 
 

-            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+            wxMessageDialog dlg(dialog, msg, _("Confirm"),
+                               wxYES_NO | wxICON_QUESTION);
+            if (dlg.ShowModal() != wxID_YES)

                 return;
         }
     }
                 return;
         }
     }

-    else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )
+    else if ((style & wxOPEN) && ( style & wxFILE_MUST_EXIST))

     {
     {

-        if ( !wxFileExists( filename ) )
+        if (!wxFileExists( filename ))

         {
         {

-            wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
+            wxMessageDialog dlg(dialog,
+                                _("Please choose an existing file."),
+                                _("Error"), wxOK | wxICON_ERROR);
+            dlg.ShowModal();

 
             return;
         }
     }
 
 
             return;
         }
     }
 

-    dialog->SetPath( filename );
+    // change to the directory where the user went if asked
+    if (style & wxCHANGE_DIR)
+    {
+        wxString cwd;
+        wxSplitPath(filename, &cwd, NULL, NULL);
+
+        if (cwd != wxGetCwd())
+        {
+            wxSetWorkingDirectory(cwd);
+        }
+    }
+
+    dialog->SetPath(filename);
+    dialog->UpdateFromDialog();

 
     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,
+                                             int 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)

 
 

-wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
-                            const wxString& defaultDir, const wxString& defaultFileName,
-                            const wxString& wildCard,
-                            long style, const wxPoint& pos )
-{
-    m_needParent = FALSE;
+BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
+        EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
+END_EVENT_TABLE()

 
 

-    if (!PreCreation( parent, pos, wxDefaultSize ) ||
-        !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, T("filedialog") ))
+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 )
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        wxFAIL_MSG( T("wxXX creation failed") );
-       return;
+        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;
+        }
+
+        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_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;
+        }
+        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);
+
+        SetWildcard(wildCard);
+        SetFilterIndex(0);

     }
     }

-    
-    m_message = message;
-    m_path = T("");
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;
-    m_dialogStyle = style;
-    m_filterIndex = 1;
-
-    m_widget = gtk_file_selection_new( m_message.mbc_str() );
-
-    int x = (gdk_screen_width () - 400) / 2;
-    int y = (gdk_screen_height () - 400) / 2;
-    gtk_widget_set_uposition( m_widget, x, y );
-
-    GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
-    gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
-
-    m_path.Append(m_dir);
-    if( ! m_path.IsEmpty() && m_path.Last()!=T('/') )
-        m_path.Append('/');
-    m_path.Append(m_fileName);
-
-    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path.mbc_str());
-
-    gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
-
-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) );
-
-    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 );
+    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);
-       if (!ext.IsEmpty())
-       {
-           m_fileName += T(".");
-            m_fileName += ext;
-       }
+        if (m_destroyed_by_delete)
+            m_widget = NULL;

     }
     }

+#endif

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-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::OnFakeOk( wxCommandEvent &event )

 {
 {

-    // TODO: implement this somehow
-    return wxFileSelector(message, default_path, default_filename, T(""),
-                          wildcard, flags, parent, x, y);
+#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;
+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++ )
+        {
+            wxString name,ext;
+            wxSplitPath(files[n], NULL, &name, &ext);
+            if (!ext.empty())
+            {
+                name += wxT(".");
+                name += ext;
+            }
+            files[n] = name;
+        }
+    }
+    else
+#endif
+        wxGenericFileDialog::GetFilenames( files );
+}

 
 

-    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        paths.Empty();
+        if (GetWindowStyle() & wxMULTIPLE)
+        {
+            GSList *gpathsi =
+                gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
+            GSList *gpaths = gpathsi;
+            while (gpathsi)
+            {
+                wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
+               paths.Add(file);
+                g_free(gpathsi->data);
+                gpathsi = gpathsi->next;
+            }
+            if (gpaths)
+                g_slist_free(gpaths);
+        }

 
 

-    if ( fileDialog.ShowModal() == wxID_OK )
+        if ( paths.IsEmpty() )
+        {
+            paths.Add(m_fileName);
+        }
+    }
+    else
+#endif
+        wxGenericFileDialog::GetPaths( paths );
+}
+
+void wxFileDialog::SetMessage(const wxString& message)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

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

     }
     else
     }
     else

+#endif
+        wxGenericFileDialog::SetMessage( message );
+}
+
+void wxFileDialog::SetPath(const wxString& path)
+{
+#ifdef __WXGTK24__
+    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();
+    }
+    else
+#endif
+        wxGenericFileDialog::SetPath( path );
+}
+
+void wxFileDialog::SetDirectory(const wxString& dir)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (wxPathExists(dir))
+        {
+            m_dir = dir;
+            m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+            UpdateDialog();
+        }
+    }
+    else
+#endif
+        wxGenericFileDialog::SetDirectory( dir );
+}
+
+void wxFileDialog::SetFilename(const wxString& name)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        return wxEmptyString;
+        m_fileName = name;
+        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+        UpdateDialog();

     }
     }

+    else
+#endif
+        wxGenericFileDialog::SetFilename( name );

 }
 
 }
 

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

 {
 {

-    wxChar *ext = (wxChar *)extension;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_wildCard = wildCard;
+        GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);

 
 

-    wxChar prompt[50];
-    wxString str = _("Load %s file");
-    wxSprintf(prompt, str, what);
+        // 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") );
+        }
+        else
+        {
+            // 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]));
+                wxString after = wildFilters[n];
+                do
+                {
+                    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(';'));
+                }
+                while (!after.empty());
+
+                gtk_file_chooser_add_filter(chooser, filter);
+            }
+        }
+    }
+    else
+#endif
+        wxGenericFileDialog::SetWildcard( wildCard );
+}

 
 

-    if (*ext == T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, T("*.%s"), ext);
+void wxFileDialog::SetFilterIndex(int filterIndex)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_filterIndex = filterIndex;

 
 

-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+        GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
+        GSList *fnode = gtk_file_chooser_list_filters(chooser);
+        GSList *filters = fnode;
+        int i = 0;
+        while (fnode)
+        {
+            if (i == filterIndex)
+            {
+                gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
+                m_filterIndex = i;
+                break;
+            }
+            i++;
+            fnode = fnode->next;
+        }
+        g_slist_free(filters);
+    }
+    else
+#endif
+        wxGenericFileDialog::SetFilterIndex( filterIndex );

 }
 
 }
 

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

 {
 {

-    wxChar *ext = (wxChar *)extension;
+#ifdef __WXGTK24__
+    // set currently selected directory to match the path:
+    if (!m_dir.empty() && wxPathExists(m_dir))
+    {
+        // 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));
+    }

 
 

-    wxChar prompt[50];
-    wxString str = _("Save %s file");
-    wxSprintf(prompt, str, what);
+    // 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));

 
 

-    if (*ext == T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, T("*.%s"), ext);
+        // 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));
+        }
+    }
+#endif
+}

 
 

-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+void wxFileDialog::UpdateFromDialog()
+{
+#ifdef __WXGTK24__
+    // 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 (fnode->data == (gpointer)current)
+        {
+            m_filterIndex = i;
+            break;
+        }
+        i++;
+        fnode = fnode->next;
+    }
+    g_slist_free(filters);
+#endif

 }
 
 }
 

+#endif // wxUSE_FILEDLG