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

Make sure all pointers to destructed window are removed from size revalidate list

Browse Source
This commit is contained in:
Paul Cornett
2016-11-03 09:22:34 -07:00
parent bca7313499
commit ebfa5a4128
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/window.cpp
View File

@@ -2688,7 +2688,7 @@ wxWindowGTK::~wxWindowGTK()
if (m_styleProvider) if (m_styleProvider)
g_object_unref(m_styleProvider); g_object_unref(m_styleProvider);
gs_sizeRevalidateList = g_list_remove(gs_sizeRevalidateList, this); gs_sizeRevalidateList = g_list_remove_all(gs_sizeRevalidateList, this);
#endif #endif
if (m_widget) if (m_widget)
@@ -4928,14 +4928,14 @@ bool wxWindowGTK::SetFont( const wxFont &font )
// invalidate the best size right before the style cache is updated, so any // invalidate the best size right before the style cache is updated, so any
// subsequent best size requests use the correct font. // subsequent best size requests use the correct font.
if (gtk_check_version(3,8,0) == NULL) if (gtk_check_version(3,8,0) == NULL)
gs_sizeRevalidateList = g_list_append(gs_sizeRevalidateList, this); gs_sizeRevalidateList = g_list_prepend(gs_sizeRevalidateList, this);
else if (gtk_check_version(3,6,0) == NULL) else if (gtk_check_version(3,6,0) == NULL)
{ {
wxWindow* tlw = wxGetTopLevelParent(static_cast<wxWindow*>(this)); wxWindow* tlw = wxGetTopLevelParent(static_cast<wxWindow*>(this));
if (tlw->m_widget && gtk_widget_get_visible(tlw->m_widget)) if (tlw->m_widget && gtk_widget_get_visible(tlw->m_widget))
g_idle_add_full(GTK_PRIORITY_RESIZE - 1, before_resize, this, NULL); g_idle_add_full(GTK_PRIORITY_RESIZE - 1, before_resize, this, NULL);
else else
gs_sizeRevalidateList = g_list_append(gs_sizeRevalidateList, this); gs_sizeRevalidateList = g_list_prepend(gs_sizeRevalidateList, this);
} }
#endif #endif