X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f057af5efcd64383486a6d56b8a4703a0118abd..1722a3f626f7b29b42a22fc6329ce12fb5e8ed90:/src/gtk/filedlg.cpp diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index e407cae561..12439a5e07 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -28,12 +28,6 @@ #include "wx/tokenzr.h" // wxStringTokenizer #include "wx/filefn.h" // ::wxGetCwd -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); - //----------------------------------------------------------------------------- // "clicked" for OK-button //----------------------------------------------------------------------------- @@ -42,7 +36,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) @@ -56,7 +50,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) msg.Printf( _("File '%s' already exists, do you really want to overwrite it?"), - wxString(wxConvFileName->cMB2WX(filename)).c_str()); + wxString(filename, *wxConvFileName)); wxMessageDialog dlg(dialog, msg, _("Confirm"), wxYES_NO | wxICON_QUESTION); @@ -65,17 +59,25 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) } } + if (style & wxFD_FILE_MUST_EXIST) + { + if ( !g_file_test(filename, G_FILE_TEST_EXISTS) ) + { + wxMessageDialog dlg( dialog, _("Please choose an existing file."), + _("Error"), wxOK| wxICON_ERROR); + dlg.ShowModal(); + return; + } + } + // change to the directory where the user went if asked 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); @@ -100,8 +102,6 @@ static void gtk_filedialog_response_callback(GtkWidget *w, gint response, wxFileDialog *dialog) { - wxapp_install_idle_handler(); - if (response == GTK_RESPONSE_ACCEPT) gtk_filedialog_ok_callback(w, dialog); else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE @@ -113,7 +113,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; @@ -161,7 +163,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, return; } - m_needParent = false; + parent = GetParentForModalDialog(parent); if (!PreCreation(parent, pos, wxDefaultSize) || !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, @@ -201,19 +203,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 +225,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); + else + fn.AssignDir(defaultDir); + + // set the initial file name and/or directory + fn.MakeAbsolute(); // GTK+ needs absolute path + const wxString dir = fn.GetPath(); + if ( !dir.empty() ) { - if ( !defaultDir.empty() ) - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultDir)); + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), + dir.fn_str()); + } - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultFileName)); + const wxString fname = fn.GetFullName(); + 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 +261,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, } else // wxFD_OPEN { - if ( !defaultFileName.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() ) + if ( !fname.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 +285,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 +317,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 wxString(str, *wxConvFileName); + } + + return wxGenericFileDialog::GetPath(); } void wxFileDialog::GetFilenames(wxArrayString& files) const @@ -336,7 +351,7 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const GSList *gpaths = gpathsi; while (gpathsi) { - wxString file(wxConvFileName->cMB2WX((gchar*) gpathsi->data)); + wxString file((gchar*) gpathsi->data, *wxConvFileName); paths.Add(file); g_free(gpathsi->data); gpathsi = gpathsi->next; @@ -368,7 +383,7 @@ void wxFileDialog::SetPath(const wxString& path) { if (path.empty()) return; - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path)); + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), path.fn_str()); } else wxGenericFileDialog::SetPath( path ); @@ -380,7 +395,7 @@ void wxFileDialog::SetDirectory(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 @@ -390,18 +405,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 wxString(str, *wxConvFileName); + } + + 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 +429,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(); }