X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f057af5efcd64383486a6d56b8a4703a0118abd..dc4689ef73c1046e49978fcd0a929f3dd975fbb9:/src/gtk/filedlg.cpp diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index e407cae561..6bc006ce84 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -42,7 +42,7 @@ extern "C" { static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) { int style = dialog->GetWindowStyle(); - gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); + wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation) #if GTK_CHECK_VERSION(2,7,3) @@ -69,13 +69,10 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) if (style & wxFD_CHANGE_DIR) { // Use chdir to not care about filename encodings - gchar* folder = g_path_get_dirname(filename); + wxGtkString folder(g_path_get_dirname(filename)); chdir(folder); - g_free(folder); } - g_free(filename); - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); event.SetEventObject(dialog); dialog->GetEventHandler()->ProcessEvent(event); @@ -113,7 +110,9 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, { #if GTK_CHECK_VERSION(2,4,0) GtkWidget *preview = GTK_WIDGET(user_data); + wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser)); + if ( !filename ) return; @@ -201,19 +200,21 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, if ( style & wxFD_MULTIPLE ) gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true); - // 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), "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), (gpointer)this); - // 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). - // Currently local-only is kept as the default - true: + // 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). Currently local-only is kept + // as the default - true: // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); g_signal_connect (m_widget, "response", @@ -221,14 +222,34 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, SetWildcard(wildCard); - if ( style & wxFD_SAVE ) + // if defaultDir is specified it should contain the directory and + // defaultFileName should contain the default name of the file, however if + // directory is not given, defaultFileName contains both + wxFileName fn; + if ( defaultDir.empty() ) + fn.Assign(defaultFileName); + else if ( !defaultFileName.empty() ) + fn.Assign(defaultDir, defaultFileName); + + // set the initial file name and/or directory + wxString fname = fn.GetFullName(); + if ( fname.empty() ) { - if ( !defaultDir.empty() ) + wxString dir = fn.GetPath(); + if ( !dir.empty() ) + { gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultDir)); + dir.fn_str()); + } + } - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultFileName)); + if ( style & wxFD_SAVE ) + { + if ( !fname.empty() ) + { + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), + fname.fn_str()); + } #if GTK_CHECK_VERSION(2,7,3) if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3)) @@ -237,22 +258,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, } else // wxFD_OPEN { - if ( !defaultFileName.empty() ) + if ( !fname.empty() ) { - wxString dir; - if ( defaultDir.empty() ) - dir = ::wxGetCwd(); - else - dir = defaultDir; - - gtk_file_chooser_set_filename( - GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) ); - } - else if ( !defaultDir.empty() ) - { - gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultDir) ); + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), + fn.GetFullPath().fn_str()); } } @@ -273,7 +282,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, void wxFileDialog::OnFakeOk( wxCommandEvent &event ) { if (!gtk_check_version(2,4,0)) - wxDialog::OnOK( event ); + EndDialog(wxID_OK); else wxGenericFileDialog::OnListOk( event ); } @@ -305,9 +314,12 @@ void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags wxString wxFileDialog::GetPath() const { if (!gtk_check_version(2,4,0)) - return wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))); - else - return wxGenericFileDialog::GetPath(); + { + wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))); + return wxConvFileName->cMB2WX(str); + } + + return wxGenericFileDialog::GetPath(); } void wxFileDialog::GetFilenames(wxArrayString& files) const @@ -390,18 +402,20 @@ void wxFileDialog::SetDirectory(const wxString& dir) wxString wxFileDialog::GetDirectory() const { if (!gtk_check_version(2,4,0)) - return wxConvFileName->cMB2WX( - gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) ) ); - else - return wxGenericFileDialog::GetDirectory(); + { + wxGtkString str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget))); + return wxConvFileName->cMB2WX(str); + } + + return wxGenericFileDialog::GetDirectory(); } void wxFileDialog::SetFilename(const wxString& name) { if (!gtk_check_version(2,4,0)) { - if (HasFlag(wxFD_SAVE)) - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name)); + if (HasFdFlag(wxFD_SAVE)) + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name)); else SetPath(wxFileName(GetDirectory(), name).GetFullPath()); } @@ -412,8 +426,7 @@ void wxFileDialog::SetFilename(const wxString& name) wxString wxFileDialog::GetFilename() const { if (!gtk_check_version(2,4,0)) - return wxFileName( - wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))) ).GetFullName(); + return wxFileName(GetPath()).GetFullName(); else return wxGenericFileDialog::GetFilename(); }