X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8375af8ff97a3649361b988a40b991a8cdaab09..ed8385818f26035d2f60d3a719250ffab48e6c34:/src/gtk/dirdlg.cpp diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp index 742961c994..846948571b 100644 --- a/src/gtk/dirdlg.cpp +++ b/src/gtk/dirdlg.cpp @@ -108,20 +108,14 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title, return; } - GtkFileChooserAction gtk_action; GtkWindow* gtk_parent = NULL; if (parent) 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; - else - gtk_action = GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER; - m_widget = gtk_file_chooser_dialog_new( wxGTK_CONV(m_message), gtk_parent, - gtk_action, + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -148,7 +142,7 @@ wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title, 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); @@ -192,7 +186,8 @@ void wxDirDialog::SetPath(const wxString& 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 @@ -204,7 +199,7 @@ wxString wxDirDialog::GetPath() const 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();