cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GTK+ errors during wxFilePickerCtrl destruction after recent changes.

Browse Source 
We do need to destroy the dialog (see #15156), but we must not destroy its
GtkWidget as it is owned by GtkFileChooserButton itself, so amend the changes
of r74030 to only destroy the C++ object, not GTK+ one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-05-22 13:36:10 +00:00
parent 50f12a6313
commit 3ca5e2db2d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/filepicker.cpp
View File

@ -103,7 +103,18 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
wxFileButton::~wxFileButton() wxFileButton::~wxFileButton()
{ {
if ( m_dialog )
{
// We need to delete the C++ dialog object here but we shouldn't delete
// its widget which is used by our GtkFileChooserButton and will be
// deleted by it when it is itself destroyed in our base class dtor. So
// take the widget ownership away from the dialog to avoid GTK+ errors
// that would happen if GtkFileChooserButton tried to access the
// already destroyed dialog widget.
g_object_unref(m_dialog->m_widget);
m_dialog->m_widget = NULL;
delete m_dialog; delete m_dialog;
}
} }
void wxFileButton::OnDialogOK(wxCommandEvent& ev) void wxFileButton::OnDialogOK(wxCommandEvent& ev)