compile fix for Mac

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index e407cae561f15908f56889220e83d3838c18c8ed..499fe0c07c41f778c24841b5c251947cbc320a13 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -228,7 +228,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
             wxConvFileName->cWX2MB(defaultDir));
 
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
-            wxConvFileName->cWX2MB(defaultFileName));
+            wxGTK_CONV(defaultFileName));
 
 #if GTK_CHECK_VERSION(2,7,3)
         if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
@@ -273,7 +273,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
     if (!gtk_check_version(2,4,0))
-        wxDialog::OnOK( event );
+        EndDialog(wxID_OK);
     else
         wxGenericFileDialog::OnListOk( event );
 }
@@ -401,7 +401,7 @@ void wxFileDialog::SetFilename(const wxString& name)
     if (!gtk_check_version(2,4,0))
     {
         if (HasFlag(wxFD_SAVE))
-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name));
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
         else
             SetPath(wxFileName(GetDirectory(), name).GetFullPath());
     }