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

Fix for crash in ~wxWindow() on solaris

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-09-25 07:17:31 +00:00
parent 5001df0dd5
commit f6551618d4
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/window.cpp
View File

@@ -2901,6 +2901,11 @@ wxWindowGTK::~wxWindowGTK()
gdk_ic_attr_destroy (m_icattr); gdk_ic_attr_destroy (m_icattr);
#endif #endif
#ifdef __WXGTK20__
// delete before the widgets to avoid a crash on solaris
delete m_imData;
#endif
if (m_wxwindow) if (m_wxwindow)
{ {
gtk_widget_destroy( m_wxwindow ); gtk_widget_destroy( m_wxwindow );
@@ -2912,10 +2917,6 @@ wxWindowGTK::~wxWindowGTK()
gtk_widget_destroy( m_widget ); gtk_widget_destroy( m_widget );
m_widget = (GtkWidget*) NULL; m_widget = (GtkWidget*) NULL;
} }
#ifdef __WXGTK20__
delete m_imData;
#endif
} }
bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ) bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size )

9
src/gtk1/window.cpp
View File

@@ -2901,6 +2901,11 @@ wxWindowGTK::~wxWindowGTK()
gdk_ic_attr_destroy (m_icattr); gdk_ic_attr_destroy (m_icattr);
#endif #endif
#ifdef __WXGTK20__
// delete before the widgets to avoid a crash on solaris
delete m_imData;
#endif
if (m_wxwindow) if (m_wxwindow)
{ {
gtk_widget_destroy( m_wxwindow ); gtk_widget_destroy( m_wxwindow );
@@ -2912,10 +2917,6 @@ wxWindowGTK::~wxWindowGTK()
gtk_widget_destroy( m_widget ); gtk_widget_destroy( m_widget );
m_widget = (GtkWidget*) NULL; m_widget = (GtkWidget*) NULL;
} }
#ifdef __WXGTK20__
delete m_imData;
#endif
} }
bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ) bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size )