X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a65ffcb229be96bbea86808bab3b1239407e8d9a..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/filepicker.cpp diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index 6779e75111..d1f18c726f 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -22,9 +22,7 @@ #include "wx/filepicker.h" #include "wx/tooltip.h" -#include - - +#include "wx/gtk/private.h" // ============================================================================ // implementation @@ -48,9 +46,6 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id, // VERY IMPORTANT: this code is identic 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)) @@ -84,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 @@ -96,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, @@ -110,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) @@ -124,14 +120,15 @@ 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); } #endif // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) @@ -162,7 +159,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) ! - 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, @@ -172,11 +169,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); } } @@ -199,9 +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; - m_acceptsFocus = true; - if (!PreCreation( parent, pos, size ) || !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, validator, name)) @@ -235,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", @@ -244,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, @@ -258,7 +251,8 @@ 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) @@ -272,7 +266,8 @@ 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); } #endif // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)