]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/filedlg.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
make wxPenRefData private
[wxWidgets.git] / src / gtk / filedlg.cpp
diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 78e2ebcadd2d422a129d5d1737a5003d3f290ec3..25a5ceba6488715317b588f12158d3904841e8a5 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -1,57 +1,62 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// 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 "filedlggtk.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
+#if wxUSE_FILEDLG && defined(__WXGTK24__)
 
 #include "wx/filedlg.h"
 
 #include "wx/filedlg.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/filename.h"
-#include "wx/msgdlg.h"
 
 
-#include <gtk/gtk.h>
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/msgdlg.h"
+#endif
 
 
-#ifdef __WXGTK24__
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #include "wx/gtk/private.h"
 
+#include <unistd.h> // chdir
+
+#include "wx/filename.h" // wxFilename
+#include "wx/tokenzr.h" // wxStringTokenizer
+#include "wx/filefn.h" // ::wxGetCwd
+
 //-----------------------------------------------------------------------------
 // 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)
 {
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
-    int style = dialog->GetStyle();
-    gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
-    wxString filename(wxGTK_CONV_BACK(text));
+    int style = dialog->GetWindowStyle();
+    wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
 
 
-    if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))
+    // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
+#if GTK_CHECK_VERSION(2,7,3)
+    if(gtk_check_version(2,7,3) != NULL)
+#endif
+    if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
     {
     {
-        if (wxFileExists(filename))
+        if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
         {
             wxString msg;
         {
             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);
@@ -59,45 +64,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
 
     // change to the directory where the user went if asked
-    if (style & wxCHANGE_DIR)
+    if (style & wxFD_CHANGE_DIR)
     {
     {
-        wxString cwd;
-        wxSplitPath(filename, &cwd, NULL, NULL);
-
-        if (cwd != wxGetCwd())
-        {
-            wxSetWorkingDirectory(cwd);
-        }
+        // Use chdir to not care about filename encodings
+        wxGtkString folder(g_path_get_dirname(filename));
+        chdir(folder);
     }
 
     }
 
-    dialog->SetPath(filename);
-    dialog->UpdateFromDialog();
-
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     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 *w, wxFileDialog *dialog)
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);
@@ -105,22 +94,44 @@ static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
 }
 
 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();
 
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
                                              wxFileDialog *dialog)
 {
     wxapp_install_idle_handler();
 
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
-    else if (response == GTK_RESPONSE_CANCEL)
+    else    // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
         gtk_filedialog_cancel_callback(w, dialog);
         gtk_filedialog_cancel_callback(w, dialog);
-    else // "delete"
-    {
-        gtk_filedialog_cancel_callback(w, dialog);
-        dialog->m_destroyed_by_delete = true;
-    }
 }
 }
-#endif
+
+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
@@ -129,380 +140,397 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog)
 
 BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog)
 
 BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
-        EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
+    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,
 END_EVENT_TABLE()
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
-                           long style, const wxPoint& pos)
+                           long style, const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)
     : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
     : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
-                       wildCard, style, pos, true )
+                          wildCard, style, pos, sz, name, true )
 {
 {
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
+    if (gtk_check_version(2,4,0))
     {
     {
-        m_needParent = false;
-        m_destroyed_by_delete = false;
+        wxGenericFileDialog::Create( parent, message, defaultDir,
+                                     defaultFileName, wildCard, style, pos );
+        return;
+    }
+
+    m_needParent = false;
 
 
-        if (!PreCreation(parent, pos, wxDefaultSize) ||
-            !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
-                    wxDefaultValidator, wxT("filedialog")))
+    if (!PreCreation(parent, pos, wxDefaultSize) ||
+        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+                wxDefaultValidator, wxT("filedialog")))
+    {
+        wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+        return;
+    }
+
+    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 & 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;
+    }
+
+    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);
+    else
+        fn.AssignDir(defaultDir);
+
+    // set the initial file name and/or directory
+    wxString fname = fn.GetFullName();
+    if ( fname.empty() )
+    {
+        wxString dir = fn.GetPath();
+        if ( !dir.empty() )
         {
         {
-            wxFAIL_MSG( wxT("wxFileDialog creation failed") );
-            return;
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                                                dir.fn_str());
         }
         }
+    }
 
 
-        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)
+    if ( style & wxFD_SAVE )
+    {
+        if ( !fname.empty() )
         {
         {
-            gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
-            ok_btn_stock = GTK_STOCK_SAVE;
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+                                              fname.fn_str());
         }
         }
-        else
+
+#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_action = GTK_FILE_CHOOSER_ACTION_OPEN;
-            ok_btn_stock = GTK_STOCK_OPEN;
+            gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
+                                          fn.GetFullPath().fn_str());
         }
         }
-        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);
     }
     }
-    else
-#endif
-        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
-}
 
 
-wxFileDialog::~wxFileDialog()
-{
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
+#if GTK_CHECK_VERSION(2,4,0)
+    if ( style & wxFD_PREVIEW )
     {
     {
-        if (m_destroyed_by_delete)
-            m_widget = NULL;
+        GtkWidget *previewImage = gtk_image_new();
+
+        gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget),
+                                            previewImage);
+        g_signal_connect(m_widget, "update-preview",
+                         G_CALLBACK(gtk_filedialog_update_preview_callback),
+                         previewImage);
     }
     }
-#endif
+#endif // GTK+ 2.4+
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     if (!gtk_check_version(2,4,0))
-        wxDialog::OnOK( event );
+        EndDialog(wxID_OK);
     else
     else
-#endif
         wxGenericFileDialog::OnListOk( event );
 }
 
 int wxFileDialog::ShowModal()
 {
         wxGenericFileDialog::OnListOk( event );
 }
 
 int wxFileDialog::ShowModal()
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
         return wxDialog::ShowModal();
     else
     if (!gtk_check_version(2,4,0))
         return wxDialog::ShowModal();
     else
-#endif
         return wxGenericFileDialog::ShowModal();
 }
 
 bool wxFileDialog::Show( bool show )
 {
         return wxGenericFileDialog::ShowModal();
 }
 
 bool wxFileDialog::Show( bool show )
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
         return wxDialog::Show( show );
     else
     if (!gtk_check_version(2,4,0))
         return wxDialog::Show( show );
     else
-#endif
         return wxGenericFileDialog::Show( show );
 }
 
         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
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+        return wxConvFileName->cMB2WX(str);
+    }
+
+    return wxGenericFileDialog::GetPath();
+}
+
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         GetPaths(files);
     if (!gtk_check_version(2,4,0))
     {
         GetPaths(files);
-        for (size_t n = 0; n < files.GetCount(); n++ )
+        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;
+            wxFileName file(files[n]);
+            files[n] = file.GetFullName();
         }
     }
     else
         }
     }
     else
-#endif
         wxGenericFileDialog::GetFilenames( files );
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
         wxGenericFileDialog::GetFilenames( files );
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         paths.Empty();
     if (!gtk_check_version(2,4,0))
     {
         paths.Empty();
-        if (GetWindowStyle() & wxMULTIPLE)
+        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 *gpathsi = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
             GSList *gpaths = gpathsi;
             while (gpathsi)
             {
             GSList *gpaths = gpathsi;
             while (gpathsi)
             {
-                wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
-               paths.Add(file);
+                wxString file(wxConvFileName->cMB2WX((gchar*) gpathsi->data));
+                paths.Add(file);
                 g_free(gpathsi->data);
                 gpathsi = gpathsi->next;
             }
                 g_free(gpathsi->data);
                 gpathsi = gpathsi->next;
             }
-            if (gpaths)
-                g_slist_free(gpaths);
+
+            g_slist_free(gpaths);
         }
         else
         }
         else
-        {
-            paths.Add(m_fileName);
-        }
+            paths.Add(GetPath());
     }
     else
     }
     else
-#endif
         wxGenericFileDialog::GetPaths( paths );
 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {
         wxGenericFileDialog::GetPaths( paths );
 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         m_message = message;
         SetTitle(message);
     }
     else
     if (!gtk_check_version(2,4,0))
     {
         m_message = message;
         SetTitle(message);
     }
     else
-#endif
         wxGenericFileDialog::SetMessage( message );
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
         wxGenericFileDialog::SetMessage( message );
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         if (path.empty()) return;
 
     if (!gtk_check_version(2,4,0))
     {
         if (path.empty()) return;
 
-        wxFileName fn(path);
-        m_path = fn.GetFullPath();
-        m_dir = fn.GetPath();
-        m_fileName = fn.GetFullName();
-        UpdateDialog();
+        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
     }
     else
     }
     else
-#endif
         wxGenericFileDialog::SetPath( path );
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
         wxGenericFileDialog::SetPath( path );
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
     if (!gtk_check_version(2,4,0))
     {
-        if (wxPathExists(dir))
+        if (wxDirExists(dir))
         {
         {
-            m_dir = dir;
-            m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-            UpdateDialog();
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }
     }
     else
         }
     }
     else
-#endif
         wxGenericFileDialog::SetDirectory( dir );
 }
 
         wxGenericFileDialog::SetDirectory( dir );
 }
 
+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);
+    }
+
+    return wxGenericFileDialog::GetDirectory();
+}
+
 void wxFileDialog::SetFilename(const wxString& name)
 {
 void wxFileDialog::SetFilename(const wxString& name)
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
     if (!gtk_check_version(2,4,0))
     {
-        m_fileName = name;
-        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-        UpdateDialog();
+        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
     }
     else
-#endif
         wxGenericFileDialog::SetFilename( name );
 }
 
         wxGenericFileDialog::SetFilename( name );
 }
 
+wxString wxFileDialog::GetFilename() const
+{
+    if (!gtk_check_version(2,4,0))
+        return wxFileName(GetPath()).GetFullName();
+    else
+        return wxGenericFileDialog::GetFilename();
+}
+
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
-#ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
     if (!gtk_check_version(2,4,0))
     {
-        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;
         // parse filters
         wxArrayString wildDescriptions, wildFilters;
-        if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
+        if (!wxParseCommonDialogsFilter(wildCard, wildDescriptions, wildFilters))
         {
         {
-            wxFAIL_MSG( wxT("Wrong file type description") );
+            wxFAIL_MSG( wxT("wxFileDialog::SetWildCard - bad wildcard string") );
         }
         else
         {
         }
         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
             // add parsed to GtkChooser
-            for (size_t n = 0; n < wildFilters.GetCount(); n++)
+            for (size_t n = 0; n < wildFilters.GetCount(); ++n)
             {
                 GtkFileFilter* filter = gtk_file_filter_new();
             {
                 GtkFileFilter* filter = gtk_file_filter_new();
-                gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
-                wxString after = wildFilters[n];
-                do
+                gtk_file_filter_set_name(filter, wxGTK_CONV(wildDescriptions[n]));
+
+                wxStringTokenizer exttok(wildFilters[n], wxT(";"));
+                while (exttok.HasMoreTokens())
                 {
                 {
-                    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(';'));
+                    wxString token = exttok.GetNextToken();
+                    gtk_file_filter_add_pattern(filter, wxGTK_CONV(token));
                 }
                 }
-                while (!after.empty());
 
                 gtk_file_chooser_add_filter(chooser, filter);
             }
 
                 gtk_file_chooser_add_filter(chooser, filter);
             }
+
+            // Reset the filter index
+            SetFilterIndex(0);
         }
     }
     else
         }
     }
     else
-#endif
         wxGenericFileDialog::SetWildcard( wildCard );
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
         wxGenericFileDialog::SetWildcard( wildCard );
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
-#ifdef __WXGTK24__
+
     if (!gtk_check_version(2,4,0))
     {
     if (!gtk_check_version(2,4,0))
     {
-        m_filterIndex = filterIndex;
-
+        gpointer filter;
         GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
         GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
-        GSList *fnode = gtk_file_chooser_list_filters(chooser);
-        GSList *filters = fnode;
-        int i = 0;
-        while (fnode)
+        GSList *filters = gtk_file_chooser_list_filters(chooser);
+
+        filter = g_slist_nth_data(filters, filterIndex);
+
+        if (filter != NULL)
         {
         {
-            if (i == filterIndex)
-            {
-                gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
-                m_filterIndex = i;
-                break;
-            }
-            i++;
-            fnode = fnode->next;
+            gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(filter));
+        }
+        else
+        {
+            wxFAIL_MSG( wxT("wxFileDialog::SetFilterIndex - bad filter index") );
         }
         }
+
         g_slist_free(filters);
     }
     else
         g_slist_free(filters);
     }
     else
-#endif
         wxGenericFileDialog::SetFilterIndex( filterIndex );
 }
 
         wxGenericFileDialog::SetFilterIndex( filterIndex );
 }
 
-void wxFileDialog::UpdateDialog()
+int wxFileDialog::GetFilterIndex() const
 {
 {
-#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));
-    }
-
-    // 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())
+    if (!gtk_check_version(2,4,0))
     {
     {
-        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));
-        }
-    }
-#endif
-}
+        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);
 
 
-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)
+        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);
-#endif
+    else
+                return wxGenericFileDialog::GetFilterIndex();
 }
 
 }
 
-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG &&  __WXGTK24__
wxWidgets (Impactor)