Fix for crash in ~wxWindow() on solaris
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5001df0dd5
commit
f6551618d4
@ -2901,6 +2901,11 @@ wxWindowGTK::~wxWindowGTK()
|
||||
gdk_ic_attr_destroy (m_icattr);
|
||||
#endif
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
// delete before the widgets to avoid a crash on solaris
|
||||
delete m_imData;
|
||||
#endif
|
||||
|
||||
if (m_wxwindow)
|
||||
{
|
||||
gtk_widget_destroy( m_wxwindow );
|
||||
@ -2912,10 +2917,6 @@ wxWindowGTK::~wxWindowGTK()
|
||||
gtk_widget_destroy( m_widget );
|
||||
m_widget = (GtkWidget*) NULL;
|
||||
}
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
delete m_imData;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size )
|
||||
|
@ -2901,6 +2901,11 @@ wxWindowGTK::~wxWindowGTK()
|
||||
gdk_ic_attr_destroy (m_icattr);
|
||||
#endif
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
// delete before the widgets to avoid a crash on solaris
|
||||
delete m_imData;
|
||||
#endif
|
||||
|
||||
if (m_wxwindow)
|
||||
{
|
||||
gtk_widget_destroy( m_wxwindow );
|
||||
@ -2912,10 +2917,6 @@ wxWindowGTK::~wxWindowGTK()
|
||||
gtk_widget_destroy( m_widget );
|
||||
m_widget = (GtkWidget*) NULL;
|
||||
}
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
delete m_imData;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size )
|
||||
|
Loading…
Reference in New Issue
Block a user