X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4db3720881d0a389bb5efd29feee81efe89b20a1..f2959820a5286e4b1595bb9c89de30fa69d6fc6a:/src/gtk/filepicker.cpp?ds=sidebyside diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index fffa3b0da9..3f99ce13f7 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -4,7 +4,6 @@ // Author: Francesco Montorsi // Modified By: // Created: 15/04/2006 -// Id: $Id$ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,11 +16,12 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) +#if wxUSE_FILEPICKERCTRL #include "wx/filepicker.h" #include "wx/tooltip.h" +#include #include "wx/gtk/private.h" // ============================================================================ @@ -43,9 +43,9 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, { // we can't use the native button for wxFLP_SAVE pickers as it can only // open existing files and there is no way to create a new file using it - if ( !(style & wxFLP_SAVE) && !gtk_check_version(2,6,0) ) + if (!(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL)) { - // VERY IMPORTANT: this code is identic to relative code in wxDirButton; + // VERY IMPORTANT: this code is identical to relative code in wxDirButton; // if you find a problem here, fix it also in wxDirButton ! if (!PreCreation( parent, pos, size ) || @@ -78,15 +78,14 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL); g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL); - // NOTE: we deliberately ignore the given label as GtkFileChooserButton // use as label the currently selected file m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); - gtk_widget_show(m_widget); + g_object_ref(m_widget); // we need to know when the dialog has been dismissed clicking OK... // NOTE: the "clicked" signal is not available for a GtkFileChooserButton // thus we are forced to use wxFileDialog's event - m_dialog->Connect(wxEVT_COMMAND_BUTTON_CLICKED, + m_dialog->Connect(wxEVT_BUTTON, wxCommandEventHandler(wxFileButton::OnDialogOK), NULL, this); @@ -103,12 +102,17 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, wxFileButton::~wxFileButton() { - // GtkFileChooserButton will automatically destroy the - // GtkFileChooserDialog associated with m_dialog. - // Thus we have to set its m_widget to NULL to avoid - // double destruction on same widget - if (m_dialog) - m_dialog->m_widget = NULL; + if ( m_dialog ) + { + // when m_dialog is deleted, it will destroy the widget it is sharing + // with GtkFileChooserButton, which results in a bunch of Gtk-CRITICAL + // errors from GtkFileChooserButton. To avoid this, call gtk_widget_destroy() + // on GtkFileChooserButton first (our base dtor will do it again, but + // that does no harm). m_dialog holds a reference to the shared widget, + // so it won't go away until m_dialog base dtor unrefs it. + gtk_widget_destroy(m_widget); + delete m_dialog; + } } void wxFileButton::OnDialogOK(wxCommandEvent& ev) @@ -121,7 +125,7 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev) UpdatePathFromDialog(m_dialog); // ...and fire an event - wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path); + wxFileDirPickerEvent event(wxEVT_FILEPICKER_CHANGED, this, GetId(), m_path); HandleWindowEvent(event); } } @@ -129,18 +133,34 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev) void wxFileButton::SetPath(const wxString &str) { m_path = str; + if (m_dialog) UpdateDialogPath(m_dialog); } -#endif // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) - - +void wxFileButton::SetInitialDirectory(const wxString& dir) +{ + if (m_dialog) + { + // Only change the directory if the default file name doesn't have any + // directory in it, otherwise it takes precedence. + if ( m_path.find_first_of(wxFileName::GetPathSeparators()) == + wxString::npos ) + { + static_cast(m_dialog)->SetDirectory(dir); + } + } + else + wxGenericFileButton::SetInitialDirectory(dir); +} +#endif // wxUSE_FILEPICKERCTRL -#if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) +#if wxUSE_DIRPICKERCTRL +#ifdef __UNIX__ #include // chdir +#endif //----------------------------------------------------------------------------- // "current-folder-changed" @@ -162,7 +182,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi // NB: it's important to use gtk_file_chooser_get_filename instead of // gtk_file_chooser_get_current_folder (see GTK docs) ! wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); - p->UpdatePath(filename); + p->GTKUpdatePath(filename); // since GtkFileChooserButton when used to pick directories also uses a combobox, // maybe that the current folder has been changed but not through the GtkFileChooserDialog @@ -173,7 +193,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi chdir(filename); // ...and fire an event - wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath()); + wxFileDirPickerEvent event(wxEVT_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath()); p->HandleWindowEvent(event); } } @@ -192,7 +212,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - if (!gtk_check_version(2,6,0)) + if (!(style & wxDIRP_USE_TEXTCTRL)) { // VERY IMPORTANT: this code is identic to relative code in wxFileButton; // if you find a problem here, fix it also in wxFileButton ! @@ -229,8 +249,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, // NOTE: we deliberately ignore the given label as GtkFileChooserButton // use as label the currently selected file m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); - - gtk_widget_show(m_widget); + g_object_ref(m_widget); // GtkFileChooserButton signals g_signal_connect(m_widget, "current-folder-changed", @@ -249,16 +268,26 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, wxDirButton::~wxDirButton() { - // GtkFileChooserButton will automatically destroy the - // GtkFileChooserDialog associated with m_dialog. - // Thus we have to set its m_widget to NULL to avoid - // double destruction on same widget if (m_dialog) - m_dialog->m_widget = NULL; + { + // see ~wxFileButton() comment + gtk_widget_destroy(m_widget); + delete m_dialog; + } } -void wxDirButton::SetPath(const wxString &str) +void wxDirButton::GTKUpdatePath(const char *gtkpath) +{ + m_path = wxString::FromUTF8(gtkpath); +} +void wxDirButton::SetPath(const wxString& str) { + if ( m_path == str ) + { + // don't do anything and especially don't set m_bIgnoreNextChange + return; + } + m_path = str; // wxDirButton uses the "current-folder-changed" signal which is triggered also @@ -272,4 +301,15 @@ void wxDirButton::SetPath(const wxString &str) UpdateDialogPath(m_dialog); } -#endif // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) +void wxDirButton::SetInitialDirectory(const wxString& dir) +{ + if (m_dialog) + { + if (m_path.empty()) + static_cast(m_dialog)->SetPath(dir); + } + else + wxGenericDirButton::SetInitialDirectory(dir); +} + +#endif // wxUSE_DIRPICKERCTRL