X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c757b5fee093bbc3686f1e474316396b742fb888..8a31648287be0ef976f133de2786b137f1e98340:/src/gtk/filepicker.cpp diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index 6784f90430..f457717e8a 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -20,13 +20,9 @@ #if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) #include "wx/filepicker.h" - #include "wx/tooltip.h" -#include - -#include // chdir - +#include "wx/gtk/private.h" // ============================================================================ // implementation @@ -45,12 +41,12 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - if (!gtk_check_version(2,6,0)) + // 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) && !(style & wxFLP_USE_TEXTCTRL) && !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 identical 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, @@ -82,10 +78,11 @@ 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( GTK_WIDGET(m_widget) ); + + g_object_ref(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 @@ -97,7 +94,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, @@ -107,11 +104,6 @@ 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 - m_dialog->m_widget = NULL; } void wxFileButton::OnDialogOK(wxCommandEvent& ev) @@ -125,10 +117,26 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev) // ...and fire an event wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } } +void wxFileButton::SetPath(const wxString &str) +{ + m_path = str; + + if (m_dialog) + UpdateDialogPath(m_dialog); +} + +void wxFileButton::SetInitialDirectory(const wxString& dir) +{ + if (m_dialog) + DoSetInitialDirectory(static_cast(m_dialog), dir); + else + wxGenericFileButton::SetInitialDirectory(dir); +} + #endif // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) @@ -136,6 +144,8 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev) #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) +#include // chdir + //----------------------------------------------------------------------------- // "current-folder-changed" //----------------------------------------------------------------------------- @@ -145,12 +155,18 @@ 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)); - p->UpdatePath(filename); + wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); + 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 @@ -159,11 +175,10 @@ 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()); - p->GetEventHandler()->ProcessEvent(event); + p->HandleWindowEvent(event); } } @@ -181,13 +196,11 @@ 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) && !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; - if (!PreCreation( parent, pos, size ) || !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, validator, name)) @@ -202,6 +215,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id, 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 @@ -219,8 +233,10 @@ 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 ); + g_object_ref(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 +245,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, @@ -239,11 +255,42 @@ 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 - m_dialog->m_widget = NULL; +} + +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 + // 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); +} + +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 && defined(__WXGTK26__)