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

Avoid using deleted widget in idle callback

Browse Source 
Use a slightly higher idle priority so callback runs before TLW is deleted,
and ref the widget just to make sure it doesn't disappear. Problem was
introduced in 0388ce8e25

(backport of 9c3900e40d, which modified
9dc7a89ccd, which wasn't backported)
This commit is contained in:
Paul Cornett
2016-11-05 17:52:21 -07:00
parent 49be360eab
commit e465b4cb2d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/toplevel.cpp
View File

@@ -1193,6 +1193,7 @@ extern "C" {
static gboolean reset_size_request(void* data) static gboolean reset_size_request(void* data)
{ {
gtk_widget_set_size_request(GTK_WIDGET(data), -1, -1); gtk_widget_set_size_request(GTK_WIDGET(data), -1, -1);
g_object_unref(data);
return false; return false;
} }
} }
@@ -1221,7 +1222,8 @@ void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)
{ {
gtk_widget_set_size_request(m_wxwindow, m_clientWidth, m_clientHeight); gtk_widget_set_size_request(m_wxwindow, m_clientWidth, m_clientHeight);
// Cancel size request at next idle to allow resizing // Cancel size request at next idle to allow resizing
g_idle_add_full(G_PRIORITY_LOW, reset_size_request, m_wxwindow, NULL); g_idle_add_full(G_PRIORITY_LOW - 1, reset_size_request, m_wxwindow, NULL);
g_object_ref(m_wxwindow);
} }
} }
} }