X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28e88942bc2c9db6ae9a8ef59545d446eefea5fb..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/filepicker.cpp?ds=inline diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index 32d0c62808..d1f18c726f 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -46,8 +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; - if (!PreCreation( parent, pos, size ) || !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK, validator, name)) @@ -81,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 @@ -107,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) @@ -121,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__) @@ -172,7 +172,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); } } @@ -195,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)) @@ -230,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", @@ -253,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) @@ -267,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__)