From 0cf4561f43949f69bcf2a3fc1bfcdf694ae36ae3 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 18 Jun 2000 15:58:47 +0000 Subject: [PATCH] Getting rid of CVS conflicts. Fixed forgotten idle priority value in wxYield(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/helpwxht.cpp | 14 +++++++------- src/generic/wizard.cpp | 1 + src/gtk/app.cpp | 2 +- src/gtk1/app.cpp | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp index 54fa21960d..9218355067 100644 --- a/src/generic/helpwxht.cpp +++ b/src/generic/helpwxht.cpp @@ -22,13 +22,13 @@ #if wxUSE_HTML && wxUSE_STREAMS #ifndef WX_PRECOMP -# include "wx/string.h" -# include "wx/utils.h" -# include "wx/list.h" -# include "wx/intl.h" -# include "wx/layout.h" -# include "wx/combobox.h" -# include "wx/button.h" + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/list.h" + #include "wx/intl.h" + #include "wx/layout.h" + #include "wx/combobox.h" + #include "wx/button.h" #endif #include "wx/helpbase.h" diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp index 745da8d084..cd776451c2 100644 --- a/src/generic/wizard.cpp +++ b/src/generic/wizard.cpp @@ -32,6 +32,7 @@ #include "wx/dynarray.h" #include "wx/intl.h" #include "wx/statbmp.h" + #include "wx/button.h" #endif //WX_PRECOMP #include "wx/statline.h" diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index dd4f14513f..0c7da45f87 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -96,7 +96,7 @@ bool wxYield() if (has_idle) { /* re-add idle handler (very low priority) */ - wxTheApp->m_idleTag = gtk_idle_add_priority( 500, wxapp_idle_callback, (gpointer) NULL ); + wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); } // disable log flushing from here because a call to wxYield() shouldn't diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index dd4f14513f..0c7da45f87 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -96,7 +96,7 @@ bool wxYield() if (has_idle) { /* re-add idle handler (very low priority) */ - wxTheApp->m_idleTag = gtk_idle_add_priority( 500, wxapp_idle_callback, (gpointer) NULL ); + wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); } // disable log flushing from here because a call to wxYield() shouldn't