X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ab296d9eb6d351eb1d2238f3e6ff2f5e6123861..129b8b1a215fc1fcc1b9f06daa0aeaf22bbce614:/src/gtk/dirdlg.cpp

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index 84f672f95d..742961c994 100644
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -29,18 +29,10 @@
     #include "wx/filedlg.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #include <unistd.h> // chdir
 
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
@@ -48,13 +40,12 @@ extern void wxapp_install_idle_handler();
 extern "C" {
 static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)
 {
-    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
-
     // change to the directory where the user went if asked
     if (dialog->HasFlag(wxDD_CHANGE_DIR))
+    {
+        wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
         chdir(filename);
-
-    g_free(filename);
+    }
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
@@ -81,8 +72,6 @@ static void gtk_dirdialog_response_callback(GtkWidget *w,
                                              gint response,
                                              wxDirDialog *dialog)
 {
-    wxapp_install_idle_handler();
-
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_dirdialog_ok_callback(w, dialog);
     else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
@@ -108,7 +97,8 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,
     if (!gtk_check_version(2,4,0))
     {
         m_message = title;
-        m_needParent = false;
+
+        parent = GetParentForModalDialog(parent);
 
         if (!PreCreation(parent, pos, wxDefaultSize) ||
             !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
@@ -124,7 +114,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,
             gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
 
         if (HasFlag(wxDD_DIR_MUST_EXIST))
-        gtk_action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
+            gtk_action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
         else
             gtk_action = GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER;
 
@@ -213,14 +203,11 @@ wxString wxDirDialog::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;
+        wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+        return wxConvFileName->cMB2WX(str);
     }
-    else
-        return wxGenericDirDialog::GetPath();
+
+    return wxGenericDirDialog::GetPath();
 }
 
 #endif // wxUSE_DIRDLG