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

In Refresh(), allow for possibility that child is mapped and parent is not.

Browse Source 
It turns out this can actually happen, and is apparently allowed by GTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-12-07 19:34:57 +00:00
parent e0e022b067
commit ffaaf1078e
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/gtk/window.cpp
View File

@@ -3568,28 +3568,31 @@ bool wxWindowGTK::ScrollPages(int pages)
void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
const wxRect *rect)
{
if (m_widget == NULL || !gtk_widget_get_mapped(m_widget))
return;
if (m_wxwindow)
{
GdkWindow* window = gtk_widget_get_window(m_wxwindow);
if (rect)
if (gtk_widget_get_mapped(m_wxwindow))
{
GdkRectangle r = { rect->x, rect->y, rect->width, rect->height };
if (GetLayoutDirection() == wxLayout_RightToLeft)
r.x = gdk_window_get_width(window) - r.x - rect->width;
gdk_window_invalidate_rect(window, &r, true);
GdkWindow* window = gtk_widget_get_window(m_wxwindow);
if (rect)
{
GdkRectangle r = { rect->x, rect->y, rect->width, rect->height };
if (GetLayoutDirection() == wxLayout_RightToLeft)
r.x = gdk_window_get_width(window) - r.x - rect->width;
gdk_window_invalidate_rect(window, &r, true);
}
else
gdk_window_invalidate_rect(window, NULL, true);
}
else
gdk_window_invalidate_rect(window, NULL, true);
}
else
else if (m_widget)
{
if (rect)
gtk_widget_queue_draw_area(m_widget, rect->x, rect->y, rect->width, rect->height);
else
gtk_widget_queue_draw(m_widget);
if (gtk_widget_get_mapped(m_widget))
{
if (rect)
gtk_widget_queue_draw_area(m_widget, rect->x, rect->y, rect->width, rect->height);
else
gtk_widget_queue_draw(m_widget);
}
}
}