Added gravity

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

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index f555dcdf17141de04ed15a20ced61e1bb3bf2ecd..16bd7a83fe774e5fd000e237fea070e6cefba66a 100644 (file)
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -97,7 +97,6 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,
     if (!gtk_check_version(2,4,0))
     {
         m_message = title;
     if (!gtk_check_version(2,4,0))
     {
         m_message = title;

-        m_needParent = false;

 
         parent = GetParentForModalDialog(parent);
 
 
         parent = GetParentForModalDialog(parent);
 


@@ -149,7 +148,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,
 
         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),

-                    wxConvFileName->cWX2MB(defaultPath) );
+                    defaultPath.fn_str() );

     }
     else
         wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name);
     }
     else
         wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name);


@@ -193,7 +192,8 @@ void wxDirDialog::SetPath(const wxString& dir)
     {
         if (wxDirExists(dir))
         {
     {
         if (wxDirExists(dir))
         {

-            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                                                dir.fn_str());

         }
     }
     else
         }
     }
     else


@@ -205,7 +205,7 @@ wxString wxDirDialog::GetPath() const
     if (!gtk_check_version(2,4,0))
     {
         wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
     if (!gtk_check_version(2,4,0))
     {
         wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));

-        return wxConvFileName->cMB2WX(str);
+        return wxString(str, *wxConvFileName);

     }
 
     return wxGenericDirDialog::GetPath();
     }
 
     return wxGenericDirDialog::GetPath();