From b7850f8fe427f68d7469668dbf6257f4a703aa7e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 7 Jun 2003 03:59:00 +0000 Subject: [PATCH] Fix for new refresh code. (It's possible for m_wxwidnow to be NULL.) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 22 +++++++++++++--------- src/gtk1/window.cpp | 22 +++++++++++++--------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 29ecd4b3fe..d91e77c9a0 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -3627,15 +3627,19 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) #ifndef __WXGTK20__ if (g_isIdle) wxapp_install_idle_handler(); - wxRect myRect (0, 0, m_wxwindow->allocation.width, - m_wxwindow->allocation.height); - - if (rect){ - myRect.Intersect(*rect); - if (!myRect.width || !myRect.height) - // nothing to do, rectangle is empty - return; - rect = &myRect; + + wxRect myRect(0,0,0,0); + if (m_wxwindow) + myRect.SetSize(wxSize( m_wxwindow->allocation.width, + m_wxwindow->allocation.height)); + + if (rect) + { + myRect.Intersect(*rect); + if (!myRect.width || !myRect.height) + // nothing to do, rectangle is empty + return; + rect = &myRect; } if (eraseBackground && m_wxwindow && m_wxwindow->window) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 29ecd4b3fe..d91e77c9a0 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -3627,15 +3627,19 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) #ifndef __WXGTK20__ if (g_isIdle) wxapp_install_idle_handler(); - wxRect myRect (0, 0, m_wxwindow->allocation.width, - m_wxwindow->allocation.height); - - if (rect){ - myRect.Intersect(*rect); - if (!myRect.width || !myRect.height) - // nothing to do, rectangle is empty - return; - rect = &myRect; + + wxRect myRect(0,0,0,0); + if (m_wxwindow) + myRect.SetSize(wxSize( m_wxwindow->allocation.width, + m_wxwindow->allocation.height)); + + if (rect) + { + myRect.Intersect(*rect); + if (!myRect.width || !myRect.height) + // nothing to do, rectangle is empty + return; + rect = &myRect; } if (eraseBackground && m_wxwindow && m_wxwindow->window)