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

More complete fix to avoid GDK assertion "impl_window->update_freeze_count > 0" on Ubuntu.

Browse Source 
Any frozen window in the whole TLW could be affected, not just a child of the enabled window.
Also do a more complete search for scrollbars.
Closes #16795


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2015-02-12 06:12:16 +00:00
parent 4ae21c7f1a
commit 9bf0ccb2bf
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gtk/window.cpp
View File

@@ -3319,22 +3319,28 @@ bool wxWindowGTK::Show( bool show )
return true; return true;
} }
static bool GetFrozen(wxWindowGTK* win, wxVector<wxWindowGTK*>& vector) static void GetFrozen(wxWindowGTK* win, wxVector<wxWindowGTK*>& vector)
{ {
bool scroll =
GTK_IS_SCROLLED_WINDOW(win->m_widget) || GTK_IS_SCROLLBAR(win->m_widget);
if (win->IsFrozen()) if (win->IsFrozen())
vector.push_back(win); vector.push_back(win);
wxWindowList& children = win->GetChildren(); wxWindowList& children = win->GetChildren();
for (wxWindowList::iterator i = children.begin(); i != children.end(); ++i) for (wxWindowList::iterator i = children.begin(); i != children.end(); ++i)
{ GetFrozen(*i, vector);
if (GetFrozen(*i, vector)) }
scroll = true;
}
return scroll; extern "C" {
static void find_scrollbar(GtkWidget* widget, void* data)
{
bool& isScrollbar = *static_cast<bool*>(data);
if (!isScrollbar)
{
if (GTK_IS_SCROLLBAR(widget))
isScrollbar = true;
else if (GTK_IS_CONTAINER(widget))
gtk_container_forall((GtkContainer*)widget, find_scrollbar, data);
}
}
} }
void wxWindowGTK::DoEnable( bool enable ) void wxWindowGTK::DoEnable( bool enable )
@@ -3347,13 +3353,14 @@ void wxWindowGTK::DoEnable( bool enable )
// Ubuntu overlay scrollbar can cause GdkWindow.impl_window to change // Ubuntu overlay scrollbar can cause GdkWindow.impl_window to change
// (by indirectly invoking gdk_window_ensure_native()), which messes up // (by indirectly invoking gdk_window_ensure_native()), which messes up
// the freeze count. Avoid this by temporarily un-freezing window hierarchy. // the freeze count. Avoid this by temporarily un-freezing window hierarchy.
if (GetFrozen(this, frozen)) bool isScrollbar = false;
find_scrollbar(m_widget, static_cast<void*>(&isScrollbar));
if (isScrollbar)
{ {
GetFrozen(wxGetTopLevelParent(static_cast<wxWindow*>(this)), frozen);
for (unsigned i = frozen.size(); i--;) for (unsigned i = frozen.size(); i--;)
frozen[i]->DoThaw(); frozen[i]->DoThaw();
} }
else
frozen.clear();
} }
gtk_widget_set_sensitive( m_widget, enable ); gtk_widget_set_sensitive( m_widget, enable );