From 9723d048559a9fbfaa465d6c07910e2532f0890b Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 14 Feb 2008 11:11:48 +0000 Subject: [PATCH] Cut down on unnecessary update events git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/mac/carbon/window.cpp | 2 +- src/motif/window.cpp | 2 +- src/msw/window.cpp | 4 ++-- src/x11/window.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 48f481aa9a..a6d22d1d8c 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2871,7 +2871,7 @@ void wxWindowGTK::OnInternalIdle() } } - if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 6d290f84a7..474ac3e572 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2958,7 +2958,7 @@ void wxWindowGTK::OnInternalIdle() } } - if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index bb64f330c2..995f935fe0 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -2894,7 +2894,7 @@ void wxWindowMac::OnInternalIdle() { // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } diff --git a/src/motif/window.cpp b/src/motif/window.cpp index b1abefc3c3..78f160c108 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -1638,7 +1638,7 @@ void wxWindow::OnInternalIdle() { // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 9d652f41a6..8720ab1363 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1479,7 +1479,7 @@ void wxWindowMSW::OnInternalIdle() } #endif // !HAVE_TRACKMOUSEEVENT - if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } @@ -1574,7 +1574,7 @@ void wxWindowMSW::Thaw() { SendSetRedraw(GetHwnd(), true); } - + // we need to refresh everything or otherwise the invalidated area // is not going to be repainted Refresh(); diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 3ff8db3b11..c34c89d3c8 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -1308,7 +1308,7 @@ void wxWindowX11::OnInternalIdle() // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - if (wxUpdateUIEvent::CanUpdate((wxWindow*) this) && IsShown()) + if (wxUpdateUIEvent::CanUpdate((wxWindow*) this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); // Set the input focus if couldn't do it before