X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e808cf8a0a77ced81143e9b27283a3b2a907a747..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/filepicker.cpp?ds=inline diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index cec62bdeb1..803815982e 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -22,6 +22,7 @@ #include "wx/filepicker.h" #include "wx/tooltip.h" +#include #include "wx/gtk/private.h" // ============================================================================ @@ -41,14 +42,17 @@ 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) +#ifndef __WXGTK3__ + && gtk_check_version(2,6,0) == NULL +#endif + ) { - // 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 ! - m_needParent = true; - m_acceptsFocus = true; - if (!PreCreation( parent, pos, size ) || !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, validator, name)) @@ -79,10 +83,9 @@ 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); // we need to know when the dialog has been dismissed clicking OK... // NOTE: the "clicked" signal is not available for a GtkFileChooserButton @@ -94,7 +97,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, @@ -104,11 +107,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) @@ -122,14 +120,24 @@ 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; - UpdateDialogPath(m_dialog); + + 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__) @@ -139,7 +147,9 @@ void wxFileButton::SetPath(const wxString &str) #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) +#ifdef __UNIX__ #include // chdir +#endif //----------------------------------------------------------------------------- // "current-folder-changed" @@ -161,7 +171,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 +183,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi // ...and fire an event wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath()); - p->GetEventHandler()->ProcessEvent(event); + p->HandleWindowEvent(event); } } @@ -191,14 +201,15 @@ 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) +#ifndef __WXGTK3__ + && gtk_check_version(2,6,0) == NULL +#endif + ) { // 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; - m_acceptsFocus = true; - if (!PreCreation( parent, pos, size ) || !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, validator, name)) @@ -231,8 +242,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( GTK_WIDGET(m_widget) ); + g_object_ref(m_widget); // GtkFileChooserButton signals g_signal_connect(m_widget, "current-folder-changed", @@ -241,7 +251,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, @@ -251,15 +261,20 @@ 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::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 @@ -269,7 +284,19 @@ void wxDirButton::SetPath(const wxString &str) // general with all wxWidgets control-manipulation functions which do not send events). m_bIgnoreNextChange = true; - UpdateDialogPath(m_dialog); + 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__)