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
This commit is contained in:
@@ -22,13 +22,13 @@
|
|||||||
#if wxUSE_HTML && wxUSE_STREAMS
|
#if wxUSE_HTML && wxUSE_STREAMS
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
# include "wx/string.h"
|
#include "wx/string.h"
|
||||||
# include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
# include "wx/list.h"
|
#include "wx/list.h"
|
||||||
# include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
# include "wx/layout.h"
|
#include "wx/layout.h"
|
||||||
# include "wx/combobox.h"
|
#include "wx/combobox.h"
|
||||||
# include "wx/button.h"
|
#include "wx/button.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/helpbase.h"
|
#include "wx/helpbase.h"
|
||||||
|
@@ -32,6 +32,7 @@
|
|||||||
#include "wx/dynarray.h"
|
#include "wx/dynarray.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
#include "wx/statbmp.h"
|
#include "wx/statbmp.h"
|
||||||
|
#include "wx/button.h"
|
||||||
#endif //WX_PRECOMP
|
#endif //WX_PRECOMP
|
||||||
|
|
||||||
#include "wx/statline.h"
|
#include "wx/statline.h"
|
||||||
|
@@ -96,7 +96,7 @@ bool wxYield()
|
|||||||
if (has_idle)
|
if (has_idle)
|
||||||
{
|
{
|
||||||
/* re-add idle handler (very low priority) */
|
/* 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
|
// disable log flushing from here because a call to wxYield() shouldn't
|
||||||
|
@@ -96,7 +96,7 @@ bool wxYield()
|
|||||||
if (has_idle)
|
if (has_idle)
|
||||||
{
|
{
|
||||||
/* re-add idle handler (very low priority) */
|
/* 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
|
// disable log flushing from here because a call to wxYield() shouldn't
|
||||||
|
Reference in New Issue
Block a user