From: Vadim Zeitlin Date: Wed, 22 May 2013 13:36:14 +0000 (+0000) Subject: Fix regression in wxGTK wxFilePickerCtrl due to wxFileDialog changes. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/268331f0db16ca664a591357e10438500b87ee20?ds=inline Fix regression in wxGTK wxFilePickerCtrl due to wxFileDialog changes. Revert the changes of r72979 and fix wxFileDialog::GetDirectory() return value bug (see #14786) differently to avoid breaking wxFilePickerCtrl which relies on getting wxEVT_BUTTON event when the associated dialog is dismissed. Closes #15218. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index 7cbbe54e43..f22b836692 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -43,7 +43,6 @@ public: virtual wxString GetPath() const; virtual void GetPaths(wxArrayString& paths) const; - virtual wxString GetDirectory() const; virtual wxString GetFilename() const; virtual void GetFilenames(wxArrayString& files) const; virtual int GetFilterIndex() const; @@ -59,9 +58,6 @@ public: virtual bool SupportsExtraControl() const { return true; } - // Implementation only. - void GTKOnAccept(); - void GTKOnCancel(); protected: // override this from wxTLW since the native @@ -72,10 +68,10 @@ protected: private: + void OnFakeOk( wxCommandEvent &event ); void OnSize(wxSizeEvent&); virtual void AddChildGTK(wxWindowGTK* child); - wxString m_selectedDirectory; wxGtkFileChooser m_fc; DECLARE_DYNAMIC_CLASS(wxFileDialog) diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index ce8c9db6cf..a2f0712854 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -31,16 +31,89 @@ #include "wx/filefn.h" // ::wxGetCwd #include "wx/modalhook.h" +//----------------------------------------------------------------------------- +// "clicked" for OK-button +//----------------------------------------------------------------------------- + +extern "C" { +static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) +{ + int style = dialog->GetWindowStyle(); + 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) +#ifndef __WXGTK3__ +#if GTK_CHECK_VERSION(2,7,3) + if (gtk_check_version(2, 7, 3) != NULL) +#endif + { + if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT)) + { + if ( g_file_test(filename, G_FILE_TEST_EXISTS) ) + { + wxString msg; + + msg.Printf( + _("File '%s' already exists, do you really want to overwrite it?"), + wxString::FromUTF8(filename)); + + wxMessageDialog dlg(dialog, msg, _("Confirm"), + wxYES_NO | wxICON_QUESTION); + if (dlg.ShowModal() != wxID_YES) + return; + } + } + } +#endif + + 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 + wxGtkString folder(g_path_get_dirname(filename)); + chdir(folder); + } + + wxCommandEvent event(wxEVT_BUTTON, wxID_OK); + event.SetEventObject(dialog); + dialog->HandleWindowEvent(event); +} +} + +//----------------------------------------------------------------------------- +// "clicked" for Cancel-button +//----------------------------------------------------------------------------- + extern "C" { -static void gtk_filedialog_response_callback(GtkWidget * WXUNUSED(w), + +static void +gtk_filedialog_cancel_callback(GtkWidget * WXUNUSED(w), wxFileDialog *dialog) +{ + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + event.SetEventObject(dialog); + dialog->HandleWindowEvent(event); +} + +static void gtk_filedialog_response_callback(GtkWidget *w, gint response, wxFileDialog *dialog) { if (response == GTK_RESPONSE_ACCEPT) - dialog->GTKOnAccept(); + gtk_filedialog_ok_callback(w, dialog); else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE - dialog->GTKOnCancel(); + gtk_filedialog_cancel_callback(w, dialog); } static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, @@ -82,6 +155,7 @@ void wxFileDialog::AddChildGTK(wxWindowGTK* child) IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase) BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase) + EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk) EVT_SIZE(wxFileDialog::OnSize) END_EVENT_TABLE() @@ -261,63 +335,18 @@ wxFileDialog::~wxFileDialog() GTK_FILE_CHOOSER(m_widget), NULL); } } -void wxFileDialog::GTKOnAccept() -{ - int style = GetWindowStyle(); - wxString filename = m_fc.GetPath(); - m_selectedDirectory = m_fc.GetDirectory(); - - // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation) -#ifndef __WXGTK3__ -#if GTK_CHECK_VERSION(2,7,3) - if (gtk_check_version(2, 7, 3) != NULL) -#endif - { - if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT)) - { - if ( g_file_test(filename.utf8_str(), G_FILE_TEST_EXISTS) ) - { - wxString msg; - - msg.Printf( - _("File '%s' already exists, do you really want to overwrite it?"), - wxString::FromUTF8(filename.utf8_str())); - - wxMessageDialog dlg(this, msg, _("Confirm"), - wxYES_NO | wxICON_QUESTION); - if (dlg.ShowModal() != wxID_YES) - return; - } - } - } -#endif - if (style & wxFD_FILE_MUST_EXIST) - { - if ( !g_file_test(filename.utf8_str(), G_FILE_TEST_EXISTS) ) - { - wxMessageDialog dlg( this, _("Please choose an existing file."), - _("Error"), wxOK| wxICON_ERROR); - dlg.ShowModal(); - return; - } - } +void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) +{ + // Update the current directory from here, accessing it later may not work + // due to the strange way GtkFileChooser works. + wxGtkString + str(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(m_widget))); + m_dir = wxString::FromUTF8(str); - // change to the directory where the user went if asked - if (style & wxFD_CHANGE_DIR) - { - // Use chdir to not care about filename encodings - wxGtkString folder(g_path_get_dirname(filename.utf8_str())); - chdir(folder); - } EndDialog(wxID_OK); } -void wxFileDialog::GTKOnCancel() -{ - EndDialog(wxID_CANCEL); -} - int wxFileDialog::ShowModal() { WX_HOOK_MODAL_DIALOG(); @@ -383,12 +412,6 @@ void wxFileDialog::SetDirectory(const wxString& dir) wxFileDialogBase::SetDirectory(dir); m_fc.SetDirectory(dir); - m_selectedDirectory = dir; -} - -wxString wxFileDialog::GetDirectory() const -{ - return m_selectedDirectory; } void wxFileDialog::SetFilename(const wxString& name)