Slightly improve wx[Generic]RichMessageDialog layout.

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 81e12219e4b4bdd387c9d66e2fe1b56e80bb7b3d..cff12d8f6fb3ea14e8bc8abb5500b5a9331d2266 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -10,7 +10,7 @@
 // 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"
 


@@ -28,12 +28,6 @@
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-

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


@@ -42,26 +36,39 @@ extern "C" {
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
     int style = dialog->GetWindowStyle();
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
     int style = dialog->GetWindowStyle();

-    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+    wxGtkString 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)
 
     // 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)
+    if (gtk_check_version(2, 7, 3) != NULL)

 #endif
 #endif

-    if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))

     {
     {

-        if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
+        if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))

         {
         {

-            wxString msg;
+            if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
+            {
+                wxString msg;
+
+                msg.Printf(
+                    _("File '%s' already exists, do you really want to overwrite it?"),
+                    wxString::FromUTF8(filename));

 
 

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

 
 

-            wxMessageDialog dlg(dialog, msg, _("Confirm"),
-                               wxYES_NO | wxICON_QUESTION);
-            if (dlg.ShowModal() != wxID_YES)
-                return;
+    if (style & wxFD_FILE_MUST_EXIST)
+    {
+        if ( !g_file_test(filename, G_FILE_TEST_EXISTS) )
+        {
+            wxMessageDialog dlg( dialog, _("Please choose an existing file."),
+                                 _("Error"), wxOK| wxICON_ERROR);
+            dlg.ShowModal();
+            return;

         }
     }
 
         }
     }
 


@@ -69,16 +76,13 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
     if (style & wxFD_CHANGE_DIR)
     {
         // Use chdir to not care about filename encodings
     if (style & wxFD_CHANGE_DIR)
     {
         // Use chdir to not care about filename encodings

-        gchar* folder = g_path_get_dirname(filename);
+        wxGtkString folder(g_path_get_dirname(filename));

         chdir(folder);
         chdir(folder);

-        g_free(folder);

     }
 
     }
 

-    g_free(filename);
-

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);

-    dialog->GetEventHandler()->ProcessEvent(event);
+    dialog->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -89,19 +93,18 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 extern "C"
 {
 
 extern "C"
 {
 

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

-    dialog->GetEventHandler()->ProcessEvent(event);
+    dialog->HandleWindowEvent(event);

 }
 
 static void gtk_filedialog_response_callback(GtkWidget *w,
                                              gint response,
                                              wxFileDialog *dialog)
 {
 }
 
 static void gtk_filedialog_response_callback(GtkWidget *w,
                                              gint response,
                                              wxFileDialog *dialog)
 {

-    wxapp_install_idle_handler();
-

     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
     else    // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
     else    // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE


@@ -111,12 +114,9 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
 static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
                                                    gpointer user_data)
 {
 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);
 
     GtkWidget *preview = GTK_WIDGET(user_data);
 

-    gchar *str = gtk_file_chooser_get_preview_filename(chooser);
-    wxGtkString filename(str);
-    if (str) g_free(str);
+    wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser));

 
     if ( !filename )
         return;
 
     if ( !filename )
         return;


@@ -129,23 +129,39 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
         g_object_unref (pixbuf);
 
     gtk_file_chooser_set_preview_widget_active(chooser, have_preview);
         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"
 
 }
 
 } // extern "C"
 

+//-----------------------------------------------------------------------------
+// "size_request" from m_extraControl
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win)
+{
+    // allow dialog to be resized smaller horizontally
+    req->width = win->GetMinWidth();
+}
+}
+
+void wxFileDialog::AddChildGTK(wxWindowGTK* child)
+{
+    g_signal_connect_after(child->m_widget, "size_request",
+        G_CALLBACK(extra_widget_size_request), child);
+    gtk_file_chooser_set_extra_widget(
+        GTK_FILE_CHOOSER(m_widget), child->m_widget);
+}

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

-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)

 
 

-BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
+BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase)

     EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
     EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)

+    EVT_SIZE(wxFileDialog::OnSize)

 END_EVENT_TABLE()
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 END_EVENT_TABLE()
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,


@@ -155,18 +171,16 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            long style, const wxPoint& pos,
                            const wxSize& sz,
                            const wxString& name)
                            long style, const wxPoint& pos,
                            const wxSize& sz,
                            const wxString& name)

-    : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
-                          wildCard, style, pos, sz, name, true )
+    : wxFileDialogBase()

 {
 {

-    if (gtk_check_version(2,4,0))
+    parent = GetParentForModalDialog(parent, style);
+
+    if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
+                                  wildCard, style, pos, sz, name))

     {
     {

-        wxGenericFileDialog::Create( parent, message, defaultDir,
-                                     defaultFileName, wildCard, style, pos );

         return;
     }
 
         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")))


@@ -199,337 +213,238 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                    ok_btn_stock, GTK_RESPONSE_ACCEPT,
                    NULL);
                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                    ok_btn_stock, GTK_RESPONSE_ACCEPT,
                    NULL);

+    g_object_ref(m_widget);
+    GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget);
+
+    m_fc.SetWidget(file_chooser);

 
     gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
 
     if ( style & wxFD_MULTIPLE )
 
     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_file_chooser_set_select_multiple(file_chooser, 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),
+    // 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(m_widget,

                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     "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:
+                    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);
 
     // 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);
 

+
+    // deal with extensions/filters

     SetWildcard(wildCard);
 
     SetWildcard(wildCard);
 

-    if ( style & wxFD_SAVE )
+    wxString defaultFileNameWithExt = defaultFileName;
+    if ( !wildCard.empty() && !defaultFileName.empty() &&
+            !wxFileName(defaultFileName).HasExt() )

     {
     {

-        if ( !defaultDir.empty() )
-            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
-            wxConvFileName->cWX2MB(defaultDir));
+        // append the default extension to the initial file name: GTK won't do
+        // it for us by default (unlike e.g. MSW)
+        const wxString defaultExt = m_fc.GetCurrentWildCard().AfterFirst('.');
+        if ( defaultExt.find_first_of("?*") == wxString::npos )
+            defaultFileNameWithExt += "." + defaultExt;
+    }

 
 

-        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
-            wxGTK_CONV(defaultFileName));
+
+    // 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(defaultFileNameWithExt);
+    else if ( !defaultFileNameWithExt.empty() )
+        fn.Assign(defaultDir, defaultFileNameWithExt);
+    else
+        fn.AssignDir(defaultDir);
+
+    // set the initial file name and/or directory
+    fn.MakeAbsolute(); // GTK+ needs absolute path
+    const wxString dir = fn.GetPath();
+    if ( !dir.empty() )
+    {
+        gtk_file_chooser_set_current_folder(file_chooser, dir.fn_str());
+    }
+
+    const wxString fname = fn.GetFullName();
+    if ( style & wxFD_SAVE )
+    {
+        if ( !fname.empty() )
+        {
+            gtk_file_chooser_set_current_name(file_chooser, fname.fn_str());
+        }

 
 #if GTK_CHECK_VERSION(2,7,3)
         if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
 
 #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);
+            gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);

 #endif
     }
     else // wxFD_OPEN
     {
 #endif
     }
     else // wxFD_OPEN
     {

-        if ( !defaultFileName.empty() )
+        if ( !fname.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) );
+            gtk_file_chooser_set_filename(file_chooser,
+                                          fn.GetFullPath().fn_str());

         }
     }
 
         }
     }
 

-#if GTK_CHECK_VERSION(2,4,0)

     if ( style & wxFD_PREVIEW )
     {
         GtkWidget *previewImage = gtk_image_new();
 
     if ( style & wxFD_PREVIEW )
     {
         GtkWidget *previewImage = gtk_image_new();
 

-        gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget),
-                                            previewImage);
+        gtk_file_chooser_set_preview_widget(file_chooser, previewImage);

         g_signal_connect(m_widget, "update-preview",
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }
         g_signal_connect(m_widget, "update-preview",
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }

-#endif // GTK+ 2.4+

 }
 
 }
 

-void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+wxFileDialog::~wxFileDialog()

 {
 {

-    if (!gtk_check_version(2,4,0))
-        EndDialog(wxID_OK);
-    else
-        wxGenericFileDialog::OnListOk( event );
+    if (m_extraControl)
+    {
+        // get chooser to drop its reference right now, allowing wxWindow dtor
+        // to verify that ref count drops to zero
+        gtk_file_chooser_set_extra_widget(
+            GTK_FILE_CHOOSER(m_widget), NULL);
+    }
+}
+
+void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
+{
+    EndDialog(wxID_OK);

 }
 
 int wxFileDialog::ShowModal()
 {
 }
 
 int wxFileDialog::ShowModal()
 {

-    if (!gtk_check_version(2,4,0))
-        return wxDialog::ShowModal();
-    else
-        return wxGenericFileDialog::ShowModal();
+    CreateExtraControl();
+
+    return wxDialog::ShowModal();

 }
 
 }
 

-bool wxFileDialog::Show( bool show )
+void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+                             int WXUNUSED(width), int WXUNUSED(height),
+                             int WXUNUSED(sizeFlags))

 {
 {

-    if (!gtk_check_version(2,4,0))
-        return wxDialog::Show( show );
-    else
-        return wxGenericFileDialog::Show( show );

 }
 
 }
 

-void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags )
+void wxFileDialog::OnSize(wxSizeEvent&)

 {
 {

-    if (!m_wxwindow)
-        return;
-    else
-        wxGenericFileDialog::DoSetSize( x, y, width, height, sizeFlags );
+    // avoid calling DoLayout(), which will set the (wrong) size of
+    // m_extraControl, its size is managed by GtkFileChooser

 }
 
 wxString wxFileDialog::GetPath() const
 {
 }
 
 wxString wxFileDialog::GetPath() const
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        gchar *str = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget));
-        wxString ret = wxConvFileName->cMB2WX(str);
-        if (str) g_free(str);
-
-        return ret;
-    }
-    else
-        return wxGenericFileDialog::GetPath();
+    return m_fc.GetPath();

 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        GetPaths(files);
-        for (size_t n = 0; n < files.GetCount(); ++n )
-        {
-            wxFileName file(files[n]);
-            files[n] = file.GetFullName();
-        }
-    }
-    else
-        wxGenericFileDialog::GetFilenames( files );
+    m_fc.GetFilenames( files );

 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        paths.Empty();
-        if (gtk_file_chooser_get_select_multiple(GTK_FILE_CHOOSER(m_widget)))
-        {
-            GSList *gpathsi = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
-            GSList *gpaths = gpathsi;
-            while (gpathsi)
-            {
-                wxString file(wxConvFileName->cMB2WX((gchar*) gpathsi->data));
-                paths.Add(file);
-                g_free(gpathsi->data);
-                gpathsi = gpathsi->next;
-            }
-
-            g_slist_free(gpaths);
-        }
-        else
-            paths.Add(GetPath());
-    }
-    else
-        wxGenericFileDialog::GetPaths( paths );
+    m_fc.GetPaths( paths );

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

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

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

-    if (!gtk_check_version(2,4,0))
-    {
-        if (path.empty()) return;
-
-        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
-    }
-    else
-        wxGenericFileDialog::SetPath( path );
+    // we need an absolute path for GTK native chooser so ensure that we have
+    // it
+    wxFileName fn(path);
+    fn.MakeAbsolute();
+    m_fc.SetPath(fn.GetFullPath());

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

-    if (!gtk_check_version(2,4,0))
+    if (m_fc.SetDirectory( dir ))

     {
     {

-        if (wxDirExists(dir))
-        {
-            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
-        }
+        // Cache the dir, as gtk_file_chooser_get_current_folder()
+        // doesn't return anything until the dialog has been shown
+        m_dir = dir;

     }
     }

-    else
-        wxGenericFileDialog::SetDirectory( dir );

 }
 
 wxString wxFileDialog::GetDirectory() const
 {
 }
 
 wxString wxFileDialog::GetDirectory() const
 {

-    if (!gtk_check_version(2,4,0))
+    wxString currentDir( m_fc.GetDirectory() );
+    if (currentDir.empty())

     {
     {

-        gchar *str = gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) );
-        wxString ret = wxConvFileName->cMB2WX(str);
-        if (str) g_free(str);
-
-        return ret;
+        // m_fc.GetDirectory() will return empty until the dialog has been shown
+        // in which case use any previously provided value
+        currentDir = m_dir;

     }
     }

-    else
-        return wxGenericFileDialog::GetDirectory();
+    return currentDir;

 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {

-    if (!gtk_check_version(2,4,0))
+    if (HasFdFlag(wxFD_SAVE))

     {
     {

-        if (HasFlag(wxFD_SAVE))
-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
-        else
-            SetPath(wxFileName(GetDirectory(), name).GetFullPath());
+        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
+        m_fileName = name;

     }
     }

+

     else
     else

-        wxGenericFileDialog::SetFilename( name );
+    {
+        wxString path( GetDirectory() );
+        if (path.empty())
+        {
+            // SetPath() fires an assert if fed other than filepaths
+            return;
+        }
+        SetPath(wxFileName(path, name).GetFullPath());
+        m_fileName = name;
+    }

 }
 
 wxString wxFileDialog::GetFilename() const
 {
 }
 
 wxString wxFileDialog::GetFilename() const
 {

-    if (!gtk_check_version(2,4,0))
-        return wxFileName(GetPath()).GetFullName();
-    else
-        return wxGenericFileDialog::GetFilename();
+    wxString currentFilename( m_fc.GetFilename() );
+    if (currentFilename.empty())
+    {
+        // m_fc.GetFilename() will return empty until the dialog has been shown
+        // in which case use any previously provided value
+        currentFilename = m_fileName;
+    }
+    return currentFilename;

 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        // parse filters
-        wxArrayString wildDescriptions, wildFilters;
-        if (!wxParseCommonDialogsFilter(wildCard, wildDescriptions, wildFilters))
-        {
-            wxFAIL_MSG( wxT("wxFileDialog::SetWildCard - bad wildcard string") );
-        }
-        else
-        {
-            // Parsing went fine. Set m_wildCard to be returned by wxFileDialogBase::GetWildcard
-            m_wildCard = wildCard;
-
-            GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
-
-            // empty current filter list:
-            GSList* ifilters = gtk_file_chooser_list_filters(chooser);
-            GSList* filters = ifilters;
-
-            while (ifilters)
-            {
-                gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
-                ifilters = ifilters->next;
-            }
-            g_slist_free(filters);
-
-            // add parsed to GtkChooser
-            for (size_t n = 0; n < wildFilters.GetCount(); ++n)
-            {
-                GtkFileFilter* filter = gtk_file_filter_new();
-                gtk_file_filter_set_name(filter, wxGTK_CONV(wildDescriptions[n]));
-
-                wxStringTokenizer exttok(wildFilters[n], wxT(";"));
-                while (exttok.HasMoreTokens())
-                {
-                    wxString token = exttok.GetNextToken();
-                    gtk_file_filter_add_pattern(filter, wxGTK_CONV(token));
-                }
-
-                gtk_file_chooser_add_filter(chooser, filter);
-            }
-
-            // Reset the filter index
-            SetFilterIndex(0);
-        }
-    }
-    else
-        wxGenericFileDialog::SetWildcard( wildCard );
+    wxFileDialogBase::SetWildcard(wildCard);
+    m_fc.SetWildcard( GetWildcard() );

 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {

-
-    if (!gtk_check_version(2,4,0))
-    {
-        gpointer filter;
-        GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
-        GSList *filters = gtk_file_chooser_list_filters(chooser);
-
-        filter = g_slist_nth_data(filters, filterIndex);
-
-        if (filter != NULL)
-        {
-            gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(filter));
-        }
-        else
-        {
-            wxFAIL_MSG( wxT("wxFileDialog::SetFilterIndex - bad filter index") );
-        }
-
-        g_slist_free(filters);
-    }
-    else
-        wxGenericFileDialog::SetFilterIndex( filterIndex );
+    m_fc.SetFilterIndex( filterIndex);

 }
 
 int wxFileDialog::GetFilterIndex() const
 {
 }
 
 int wxFileDialog::GetFilterIndex() const
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
-        GtkFileFilter *filter = gtk_file_chooser_get_filter(chooser);
-        GSList *filters = gtk_file_chooser_list_filters(chooser);
-        gint index = g_slist_index(filters, filter);
-        g_slist_free(filters);
-
-        if (index == -1)
-        {
-            wxFAIL_MSG( wxT("wxFileDialog::GetFilterIndex - bad filter index returned by gtk+") );
-            return 0;
-        }
-        else
-            return index;
-    }
-    else
-                return wxGenericFileDialog::GetFilterIndex();
+    return m_fc.GetFilterIndex();

 }
 
 }
 

-#endif // wxUSE_FILEDLG &&  __WXGTK24__
+#endif // wxUSE_FILEDLG