AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed gtk 1.2.x wxYield() problem (tested).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder 1999-04-08 20:51:00 +00:00
parent 7cf8333086
commit 53a8af592a
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/app.h
View File

@ -120,6 +120,10 @@ class wxApp: public wxEvtHandler
#endif #endif
void DeletePendingObjects(); void DeletePendingObjects();
/// This can be used to suppress the generation of Idle events.
inline void SuppressIdleEvents(bool arg = TRUE) { m_suppressIdleEvents = arg; }
inline bool GetSuppressIdleEvents() const { return m_suppressIdleEvents; }
bool m_initialized; bool m_initialized;
bool m_exitOnFrameDelete; bool m_exitOnFrameDelete;
bool m_wantDebugOutput; bool m_wantDebugOutput;
@ -136,7 +140,9 @@ class wxApp: public wxEvtHandler
wxString m_className; wxString m_className;
static wxAppInitializerFunction m_appInitFn; static wxAppInitializerFunction m_appInitFn;
private:
/// Set to TRUE while we are in wxYield().
bool m_suppressIdleEvents;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

8
include/wx/gtk1/app.h
View File

@ -120,6 +120,10 @@ class wxApp: public wxEvtHandler
#endif #endif
void DeletePendingObjects(); void DeletePendingObjects();
/// This can be used to suppress the generation of Idle events.
inline void SuppressIdleEvents(bool arg = TRUE) { m_suppressIdleEvents = arg; }
inline bool GetSuppressIdleEvents() const { return m_suppressIdleEvents; }
bool m_initialized; bool m_initialized;
bool m_exitOnFrameDelete; bool m_exitOnFrameDelete;
bool m_wantDebugOutput; bool m_wantDebugOutput;
@ -136,7 +140,9 @@ class wxApp: public wxEvtHandler
wxString m_className; wxString m_className;
static wxAppInitializerFunction m_appInitFn; static wxAppInitializerFunction m_appInitFn;
private:
/// Set to TRUE while we are in wxYield().
bool m_suppressIdleEvents;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

10
src/gtk/app.cpp
View File

@ -135,6 +135,9 @@ void wxExit()
gtk_main_quit(); gtk_main_quit();
} }
// forward decl
gint wxapp_idle_callback( gpointer WXUNUSED(data) );
bool wxYield() bool wxYield()
{ {
// it's necessary to call ProcessIdle() to update the frames sizes which // it's necessary to call ProcessIdle() to update the frames sizes which
@ -148,9 +151,14 @@ bool wxYield()
win->OnInternalIdle(); win->OnInternalIdle();
} }
while (gtk_events_pending() > 0) // We need to temporarily remove idle callbacks or the loop will
// never finish.
gtk_idle_remove( wxTheApp->m_idleTag );
while (gtk_events_pending())
gtk_main_iteration(); gtk_main_iteration();
wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
return TRUE; return TRUE;
} }

10
src/gtk1/app.cpp
View File

@ -135,6 +135,9 @@ void wxExit()
gtk_main_quit(); gtk_main_quit();
} }
// forward decl
gint wxapp_idle_callback( gpointer WXUNUSED(data) );
bool wxYield() bool wxYield()
{ {
// it's necessary to call ProcessIdle() to update the frames sizes which // it's necessary to call ProcessIdle() to update the frames sizes which
@ -148,9 +151,14 @@ bool wxYield()
win->OnInternalIdle(); win->OnInternalIdle();
} }
while (gtk_events_pending() > 0) // We need to temporarily remove idle callbacks or the loop will
// never finish.
gtk_idle_remove( wxTheApp->m_idleTag );
while (gtk_events_pending())
gtk_main_iteration(); gtk_main_iteration();
wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
return TRUE; return TRUE;
} }