implementation streamlined

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 20bc8b05589b8c6752b62376a152ebcdf966f362..57a34be327cf5f7867422834974c00cca9d35e37 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -1,55 +1,61 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/filedlg.cpp
+// Name:        src/gtk/filedlg.cpp

 // Purpose:     native implementation of wxFileDialog
 // Purpose:     native implementation of wxFileDialog

-// Author:      Robert Roebling, Zbigniew Zagorski
+// Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp

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

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

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_FILEDLG && defined(__WXGTK24__)
+#if wxUSE_FILEDLG

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

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/filename.h"
-#include "wx/msgdlg.h"
+
+#ifdef __WXGTK24__

 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 
 #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
 //-----------------------------------------------------------------------------
 
 extern void wxapp_install_idle_handler();
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------
 
 extern void wxapp_install_idle_handler();

-extern bool g_isIdle;

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

+extern "C" {

 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
     int style = dialog->GetStyle();
 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));
+    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));

 
 

+    // 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 & 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(
             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(wxConvFileName->cMB2WX(filename)).c_str());

 
             wxMessageDialog dlg(dialog, msg, _("Confirm"),
                                wxYES_NO | wxICON_QUESTION);
 
             wxMessageDialog dlg(dialog, msg, _("Confirm"),
                                wxYES_NO | wxICON_QUESTION);


@@ -57,43 +63,29 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
                 return;
         }
     }
                 return;
         }
     }

-    else if ((style & wxOPEN) && ( style & wxFILE_MUST_EXIST))
-    {
-        if (!wxFileExists( filename ))
-        {
-            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)
     {
 
     // 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);
-        }
+        // Use chdir to not care about filename encodings
+        gchar* folder = g_path_get_dirname(filename);
+        chdir(folder);
+        g_free(folder);

     }
 
     }
 

-    dialog->SetPath(filename);
-    dialog->UpdateFromDialog();
-    
+    g_free(filename);
+

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }

+}

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

+extern "C" {

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


@@ -101,61 +93,80 @@ static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }

+}

 
 

+extern "C" {

 static void gtk_filedialog_response_callback(GtkWidget *w,
 static void gtk_filedialog_response_callback(GtkWidget *w,

-                                             int response,
+                                             gint response,

                                              wxFileDialog *dialog)
 {
     wxapp_install_idle_handler();
                                              wxFileDialog *dialog)
 {
     wxapp_install_idle_handler();

-    
+

     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);

-    else
+    else if (response == GTK_RESPONSE_CANCEL)
+        gtk_filedialog_cancel_callback(w, dialog);
+    else // "delete"
+    {

         gtk_filedialog_cancel_callback(w, dialog);
         gtk_filedialog_cancel_callback(w, dialog);

+        dialog->m_destroyed_by_delete = true;
+    }
+}

 }
 
 }
 

+#endif // __WXGTK24__
+

 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // 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)
 
 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)
+    : 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,
+        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;
-    }
+        {
+            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(
+        GtkFileChooserAction gtk_action;
+        GtkWindow* gtk_parent = NULL;
+        if (parent)
+            gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
+
+        const 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;
+        }
+
+        m_widget = gtk_file_chooser_dialog_new(

                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,
                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,


@@ -163,230 +174,345 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                        ok_btn_stock, GTK_RESPONSE_ACCEPT,
                        NULL);
 
                        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);
+        if ( style & wxMULTIPLE )
+            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
+
+        // 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(G_OBJECT(m_widget), "response",
+            GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), (gpointer)this);
+
+        SetWildcard(wildCard);
+
+        if ( style & wxSAVE )
+        {
+            if ( !defaultDir.empty() )
+                gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                wxConvFileName->cWX2MB(defaultDir));
+
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+                wxConvFileName->cWX2MB(defaultFileName));
+
+#if GTK_CHECK_VERSION(2,7,3)
+            if (!gtk_check_version(2,7,3))
+                gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
+#endif
+        }
+        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 );

 }
 
 wxFileDialog::~wxFileDialog()
 {
 }
 
 wxFileDialog::~wxFileDialog()
 {

+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (m_destroyed_by_delete)
+            m_widget = NULL;
+    }
+#endif
+}
+
+void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        wxDialog::OnOK( event );
+    else
+#endif
+        wxGenericFileDialog::OnListOk( event );
+}
+
+int wxFileDialog::ShowModal()
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else
+#endif
+        return wxGenericFileDialog::ShowModal();

 }
 
 }
 

-void wxFileDialog::GetFilenames(wxArrayString& files) const 
+bool wxFileDialog::Show( bool show )

 {
 {

-    GetPaths(files);
-    for (size_t n = 0; n < files.GetCount(); n++ )
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else
+#endif
+        return wxGenericFileDialog::Show( show );
+}
+
+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 );
+}
+
+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();
+}
+
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        wxString name,ext;
-        wxSplitPath(files[n], NULL, &name, &ext);
-        if (!ext.IsEmpty())
+        GetPaths(files);
+        for (size_t n = 0; n < files.GetCount(); ++n )

         {
         {

-            name += wxT(".");
-            name += ext;
+            wxFileName file(files[n]);
+            files[n] = file.GetFullName();

         }
         }

-        files[n] = name;

     }
     }

+    else
+#endif
+        wxGenericFileDialog::GetFilenames( files );

 }
 
 }
 

-void wxFileDialog::GetPaths(wxArrayString& paths) const 
+void wxFileDialog::GetPaths(wxArrayString& paths) const

 {
 {

-    paths.Empty(); 
-    if (GetWindowStyle() & wxMULTIPLE)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        GSList *gpathsi = 
-            gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
-        GSList *gpaths = gpathsi;
-        while (gpathsi)
+        paths.Empty();
+        if (gtk_file_chooser_get_select_multiple(GTK_FILE_CHOOSER(m_widget)))

         {
         {

-            wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
-            paths.Add(file);
-            g_free(gpathsi->data);
-            gpathsi = gpathsi->next;
-        }
-        if (gpaths) 
+            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);
             g_slist_free(gpaths);

+        }
+        else
+            paths.Add(GetPath());

     }
     else
     }
     else

-    {
-        paths.Add(m_fileName);
-    }
+#endif
+        wxGenericFileDialog::GetPaths( paths );

 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {
 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {

-    m_message = message;
-    SetTitle(message);
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_message = message;
+        SetTitle(message);
+    }
+    else
+#endif
+        wxGenericFileDialog::SetMessage( message );

 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {

-    if (path.empty()) return;
+#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();
+        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
+    }
+    else
+#endif
+        wxGenericFileDialog::SetPath( path );

 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {

-    if (wxDirExists(dir))
+#ifdef __WXGTK24__
+    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), wxConvFileName->cWX2MB(dir));
+        }

     }
     }

+    else
+#endif
+        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();
+#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();

 }
 
 }
 

-void wxFileDialog::UpdateDialog()
+void wxFileDialog::SetFilename(const wxString& name)

 {
 {

-    // set currently selected directory to match the path:
-    if (!m_dir.empty() && wxDirExists(m_dir))
+#ifdef __WXGTK24__
+    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 (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 );

 }
 
 }
 

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

+#endif
+        return wxGenericFileDialog::GetFilename();
+}
+
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+#ifdef __WXGTK24__
+    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))

         {
         {

-            GtkFileFilter* filter = gtk_file_filter_new();
-            gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
-            wxString after = wildFilters[n];
-            do
+            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)

             {
             {

-                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
+#endif
+        wxGenericFileDialog::SetWildcard( wildCard );

 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 }
 
 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)
+#ifdef __WXGTK24__
+    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(filter));
+        }
+        else

         {
         {

-            gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
-            m_filterIndex = i;
-            break;
+            wxFAIL_MSG( wxT("wxFileDialog::SetFilterIndex - bad filter index") );

         }
         }

-        i++;
-        fnode = fnode->next;
+
+        g_slist_free(filters);

     }
     }

-    g_slist_free(filters);
+    else
+#endif
+        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)
+#ifdef __WXGTK24__
+    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
+#endif
+                return wxGenericFileDialog::GetFilterIndex();

 }
 
 }
 

-#endif // wxUSE_FILEDLG && defined(__WXGTK24__)
+#endif // wxUSE_FILEDLG