Make status bar grip move to the left in RTL.

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 71d76a691559ad6d21e0faafdcbbedd131d76180..16cc0b0c5617b699e286bd0978912513cef73c46 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     native implementation of wxFileDialog
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
 // Id:          $Id$
 // Purpose:     native implementation of wxFileDialog
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
 // Id:          $Id$


@@ -7,39 +7,32 @@
 // 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"
 

-// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers
-#include "wx/setup.h"
-
-#if wxUSE_FILEDLG
+#if wxUSE_FILEDLG && defined(__WXGTK24__)

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

-#ifdef __WXGTK24__
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/msgdlg.h"
+#endif

 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #include <unistd.h> // chdir
 
 
 #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/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


@@ -48,10 +41,14 @@ extern bool g_isIdle;
 extern "C" {
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
 extern "C" {
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {

-    int style = dialog->GetStyle();
-    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+    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 ( g_file_test(filename, G_FILE_TEST_EXISTS) )
         {
     {
         if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
         {


@@ -69,16 +66,13 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
     }
 
     // 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)

     {
         // Use chdir to not care about filename encodings
     {
         // 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);
     dialog->GetEventHandler()->ProcessEvent(event);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);


@@ -89,17 +83,16 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 

-extern "C" {
-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);
     dialog->GetEventHandler()->ProcessEvent(event);
 }
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }

-}

 
 

-extern "C" {

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


@@ -108,17 +101,37 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
 
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
 
     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;
-    }

 }
 }

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

 }
 
 }
 

-#endif // __WXGTK24__
+} // extern "C"
+

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


@@ -134,152 +147,173 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
                            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))

     {
     {

-        wxASSERT_MSG( !( (style & wxSAVE) && (style & wxMULTIPLE) ), wxT("wxFileDialog - wxMULTIPLE used on a save dialog" ) );
-        m_needParent = false;
-        m_destroyed_by_delete = false;
+        wxGenericFileDialog::Create( parent, message, defaultDir,
+                                     defaultFileName, wildCard, style, pos );
+        return;
+    }

 
 

-        if (!PreCreation(parent, pos, wxDefaultSize) ||
-            !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
-                    wxDefaultValidator, wxT("filedialog")))
-        {
-            wxFAIL_MSG( wxT("wxFileDialog creation failed") );
-            return;
-        }
+    m_needParent = false;

 
 

-        GtkFileChooserAction gtk_action;
-        GtkWindow* gtk_parent = NULL;
-        if (parent)
-            gtk_parent = GTK_WINDOW(parent->m_widget);
+    if (!PreCreation(parent, pos, wxDefaultSize) ||
+        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+                wxDefaultValidator, wxT("filedialog")))
+    {
+        wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+        return;
+    }

 
 

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

 
 

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

 
 

-        if ( style & wxMULTIPLE )
-            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
+    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);

 
 

-        // 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);
+    gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);

 
 

-        g_signal_connect(G_OBJECT(m_widget), "response",
-            GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), (gpointer)this);
+    if ( style & wxFD_MULTIPLE )
+        gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);

 
 

-        SetWildcard(wildCard);
+    // 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);

 
 

-        if ( style & wxSAVE )
-        {
-            if ( !defaultDir.IsEmpty() )
-                gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
-                wxConvFileName->cWX2MB(defaultDir));
+    // 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 ( style & wxFD_SAVE )
+    {
+        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));
+        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+            wxGTK_CONV(defaultFileName));
+
+#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 ( !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
+        else if ( !defaultDir.empty() )

         {
         {

-            if ( !defaultFileName.IsEmpty() )
-            {
-                wxString dir;
-                if ( defaultDir.IsEmpty() )
-                    dir = ::wxGetCwd();
-                else
-                    dir = defaultDir;
-
-                gtk_file_chooser_set_filename(
-                    GTK_FILE_CHOOSER(m_widget),
-                    wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
-            }
-            else if ( !defaultDir.IsEmpty() )
-                gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
-                    wxConvFileName->cWX2MB(defaultDir) );
+            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()
-{
-#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
 {
 wxString wxFileDialog::GetPath() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     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();
+    {
+        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);


@@ -290,13 +324,11 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
         }
     }
     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();


@@ -318,26 +350,22 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
             paths.Add(GetPath());
     }
     else
             paths.Add(GetPath());
     }
     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;


@@ -345,65 +373,56 @@ void wxFileDialog::SetPath(const wxString& path)
         gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
     }
     else
         gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
     }
     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))

         {
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }
     }
     else
         {
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }
     }
     else

-#endif

         wxGenericFileDialog::SetDirectory( dir );
 }
 
 wxString wxFileDialog::GetDirectory() const
 {
         wxGenericFileDialog::SetDirectory( dir );
 }
 
 wxString wxFileDialog::GetDirectory() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     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();
+    {
+        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))
     {

-        if (GetStyle() & wxSAVE)
-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name));
+        if (HasFlag(wxFD_SAVE))
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));

         else
             SetPath(wxFileName(GetDirectory(), name).GetFullPath());
     }
     else
         else
             SetPath(wxFileName(GetDirectory(), name).GetFullPath());
     }
     else

-#endif

         wxGenericFileDialog::SetFilename( name );
 }
 
 wxString wxFileDialog::GetFilename() const
 {
         wxGenericFileDialog::SetFilename( name );
 }
 
 wxString wxFileDialog::GetFilename() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     if (!gtk_check_version(2,4,0))

-        return wxFileName(
-            wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))) ).GetFullName();
+        return wxFileName(GetPath()).GetFullName();

     else
     else

-#endif

         return wxGenericFileDialog::GetFilename();
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
         return wxGenericFileDialog::GetFilename();
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         // parse filters
     if (!gtk_check_version(2,4,0))
     {
         // parse filters


@@ -451,13 +470,12 @@ void wxFileDialog::SetWildcard(const wxString& wildCard)
         }
     }
     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))
     {
         gpointer filter;
     if (!gtk_check_version(2,4,0))
     {
         gpointer filter;


@@ -478,13 +496,11 @@ void wxFileDialog::SetFilterIndex(int filterIndex)
         g_slist_free(filters);
     }
     else
         g_slist_free(filters);
     }
     else

-#endif

         wxGenericFileDialog::SetFilterIndex( filterIndex );
 }
 
 int wxFileDialog::GetFilterIndex() const
 {
         wxGenericFileDialog::SetFilterIndex( filterIndex );
 }
 
 int wxFileDialog::GetFilterIndex() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
     if (!gtk_check_version(2,4,0))
     {
         GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);


@@ -502,8 +518,7 @@ int wxFileDialog::GetFilterIndex() const
             return index;
     }
     else
             return index;
     }
     else

-#endif

                 return wxGenericFileDialog::GetFilterIndex();
 }
 
                 return wxGenericFileDialog::GetFilterIndex();
 }
 

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