X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ce7b1e43fdf835a77a78765fe73de707b89e85f..c267759c8f0d9d8954b2cc883c868b23ff1ca9ee:/src/gtk/filepicker.cpp diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index a32f2cc185..841d47c106 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -20,19 +20,10 @@ #if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) #include "wx/filepicker.h" +#include "wx/tooltip.h" #include "wx/gtk/private.h" -#if wxUSE_TOOLTIPS - #include "wx/tooltip.h" -#endif - -#include -#include - -#include // chdir - - // ============================================================================ // implementation // ============================================================================ @@ -52,10 +43,8 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, { if (!gtk_check_version(2,6,0)) { - // VERY IMPORTANT: this code is identic to relative code in wxFileButton; - // if you find a problem here, fix it also in wxFileButton ! - - m_needParent = true; + // VERY IMPORTANT: this code is identic to relative code in wxDirButton; + // if you find a problem here, fix it also in wxDirButton ! if (!PreCreation( parent, pos, size ) || !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, @@ -66,9 +55,13 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, } // create the dialog associated with this button + // NB: unlike generic implementation, native GTK implementation needs to create + // the filedialog here as it needs to use gtk_file_chooser_button_new_with_dialog() SetWindowStyle(style); m_path = path; - if (!CreateDialog(message, wildcard)) + m_message = message; + m_wildcard = wildcard; + if ((m_dialog = CreateDialog()) == NULL) return false; // little trick used to avoid problems when there are other GTK windows 'grabbed': @@ -86,7 +79,7 @@ bool wxFileButton::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( GTK_WIDGET(m_widget) ); + gtk_widget_show(m_widget); // we need to know when the dialog has been dismissed clicking OK... // NOTE: the "clicked" signal is not available for a GtkFileChooserButton @@ -98,7 +91,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); PostCreation(size); - SetBestSize(size); + SetInitialSize(size); } else return wxGenericFileButton::Create(parent, id, label, path, message, wildcard, @@ -112,7 +105,8 @@ wxFileButton::~wxFileButton() // GtkFileChooserDialog associated with m_dialog. // Thus we have to set its m_widget to NULL to avoid // double destruction on same widget - m_dialog->m_widget = NULL; + if (m_dialog) + m_dialog->m_widget = NULL; } void wxFileButton::OnDialogOK(wxCommandEvent& ev) @@ -122,7 +116,7 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev) if (ev.GetId() == wxID_OK) { // ...update our path - UpdatePathFromDialog(); + UpdatePathFromDialog(m_dialog); // ...and fire an event wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path); @@ -130,6 +124,13 @@ 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__) @@ -137,6 +138,8 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev) #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) +#include // chdir + //----------------------------------------------------------------------------- // "current-folder-changed" //----------------------------------------------------------------------------- @@ -146,11 +149,17 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi wxDirButton *p) { // update the m_path member of the wxDirButtonGTK + // unless the path was changed by wxDirButton::SetPath() + if (p->m_bIgnoreNextChange) + { + p->m_bIgnoreNextChange=false; + return; + } wxASSERT(p); // NB: it's important to use gtk_file_chooser_get_filename instead of // gtk_file_chooser_get_current_folder (see GTK docs) ! - gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); + wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); p->UpdatePath(filename); // since GtkFileChooserButton when used to pick directories also uses a combobox, @@ -160,7 +169,6 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi // style was given. if (p->HasFlag(wxDIRP_CHANGE_DIR)) chdir(filename); - g_free(filename); // ...and fire an event wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath()); @@ -187,8 +195,6 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, // VERY IMPORTANT: this code is identic to relative code in wxFileButton; // if you find a problem here, fix it also in wxFileButton ! - m_needParent = true; - if (!PreCreation( parent, pos, size ) || !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, validator, name)) @@ -199,9 +205,11 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, // create the dialog associated with this button SetWindowStyle(style); - m_path = path; - if (!CreateDialog(message, wildcard)) + m_message = message; + m_wildcard = wildcard; + if ((m_dialog = CreateDialog()) == NULL) return false; + SetPath(path); // little trick used to avoid problems when there are other GTK windows 'grabbed': // GtkFileChooserDialog won't be responsive to user events if there is another @@ -220,7 +228,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, // use as label the currently selected file m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); - gtk_widget_show( GTK_WIDGET(m_widget) ); + gtk_widget_show(m_widget); // GtkFileChooserButton signals g_signal_connect(m_widget, "current-folder-changed", @@ -229,7 +237,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); PostCreation(size); - SetBestSize(size); + SetInitialSize(size); } else return wxGenericDirButton::Create(parent, id, label, path, message, wildcard, @@ -243,7 +251,23 @@ wxDirButton::~wxDirButton() // GtkFileChooserDialog associated with m_dialog. // Thus we have to set its m_widget to NULL to avoid // double destruction on same widget - m_dialog->m_widget = NULL; + if (m_dialog) + m_dialog->m_widget = NULL; +} + +void wxDirButton::SetPath(const wxString &str) +{ + m_path = str; + + // wxDirButton uses the "current-folder-changed" signal which is triggered also + // when we set the path on the dialog associated with this button; thus we need + // to set the following flag to avoid sending a wxFileDirPickerEvent from this + // function (which would be inconsistent with wxFileButton's behaviour and in + // general with all wxWidgets control-manipulation functions which do not send events). + m_bIgnoreNextChange = true; + + if (m_dialog) + UpdateDialogPath(m_dialog); } #endif // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)