Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index 08e4a0af44558238d0f61238993209588ff81103..df9bdef8e2ed243da7b323d1f6636c35b5e3d281 100644 (file)
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -31,7 +31,9 @@
 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 

+#ifdef __UNIX__

 #include <unistd.h> // chdir
 #include <unistd.h> // chdir

+#endif

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


@@ -96,17 +98,28 @@ wxDirDialog::wxDirDialog(wxWindow* parent,
                          const wxPoint& pos,
                          const wxSize& WXUNUSED(sz),
                          const wxString& WXUNUSED(name))
                          const wxPoint& pos,
                          const wxSize& WXUNUSED(sz),
                          const wxString& WXUNUSED(name))

+{
+    Create(parent, title, defaultPath, style, pos);
+}
+
+bool wxDirDialog::Create(wxWindow* parent,
+                         const wxString& title,
+                         const wxString& defaultPath,
+                         long style,
+                         const wxPoint& pos,
+                         const wxSize& WXUNUSED(sz),
+                         const wxString& WXUNUSED(name))

 {
     m_message = title;
 
 {
     m_message = title;
 

-    parent = GetParentForModalDialog(parent);
+    parent = GetParentForModalDialog(parent, style);

 
     if (!PreCreation(parent, pos, wxDefaultSize) ||
         !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
                 wxDefaultValidator, wxT("dirdialog")))
     {
         wxFAIL_MSG( wxT("wxDirDialog creation failed") );
 
     if (!PreCreation(parent, pos, wxDefaultSize) ||
         !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
                 wxDefaultValidator, wxT("dirdialog")))
     {
         wxFAIL_MSG( wxT("wxDirDialog creation failed") );

-        return;
+        return false;

     }
 
     GtkWindow* gtk_parent = NULL;
     }
 
     GtkWindow* gtk_parent = NULL;


@@ -127,7 +140,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent,
     // 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...
     // 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),
+    g_signal_connect (m_widget,

                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     (gpointer)this);
                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     (gpointer)this);


@@ -135,7 +148,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent,
     // 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,
     // 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).
+    // 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);
 
     // Currently local-only is kept as the default - true:
     // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
 


@@ -144,7 +157,9 @@ wxDirDialog::wxDirDialog(wxWindow* parent,
 
     if ( !defaultPath.empty() )
         gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
 
     if ( !defaultPath.empty() )
         gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),

-                defaultPath.fn_str() );
+                                             wxGTK_CONV_FN(defaultPath) );
+
+    return true;

 }
 
 void wxDirDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDirDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))


@@ -165,14 +180,14 @@ void wxDirDialog::SetPath(const wxString& dir)
     if (wxDirExists(dir))
     {
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
     if (wxDirExists(dir))
     {
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),

-                                            dir.fn_str());
+                                            wxGTK_CONV_FN(dir));

     }
 }
 
 wxString wxDirDialog::GetPath() const
 {
     wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
     }
 }
 
 wxString wxDirDialog::GetPath() const
 {
     wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));

-    return wxString(str, *wxConvFileName);
+    return wxString::FromUTF8(str);

 }
 
 #endif // wxUSE_DIRDLG
 }
 
 #endif // wxUSE_DIRDLG