add wxUSE_OLE_AUTOMATION here too

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

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index cd9beb423ab366eb3a09225e6dc1728518cc814b..84f672f95dd48d68e0eebe9bae8cf28d48753328 100644 (file)
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -161,14 +161,13 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,
                     wxConvFileName->cWX2MB(defaultPath) );
     }
     else
-#endif
         wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name);
 }
 
 void wxDirDialog::OnFakeOk( wxCommandEvent &event )
 {
     if (!gtk_check_version(2,4,0))
-        wxDialog::OnOK( event );
+        EndDialog(wxID_OK);
     else
         wxGenericDirDialog::OnOK( event );
 }
@@ -203,7 +202,7 @@ void wxDirDialog::SetPath(const wxString& dir)
     {
         if (wxDirExists(dir))
         {
-            gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }
     }
     else
@@ -213,7 +212,13 @@ void wxDirDialog::SetPath(const wxString& dir)
 wxString wxDirDialog::GetPath() const
 {
     if (!gtk_check_version(2,4,0))
-        return wxConvFileName->cMB2WX( gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(m_widget) ) );
+    {
+        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 wxGenericDirDialog::GetPath();
 }