wxBase/GUI separation: 1st step, wxMSW should build, all the rest is broken
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -92,15 +92,6 @@ extern bool g_isIdle;
|
||||
|
||||
void wxapp_install_idle_handler();
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxExit
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void wxExit()
|
||||
{
|
||||
gtk_main_quit();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxYield
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -168,20 +159,15 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
||||
// wxWakeUpIdle
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
static bool gs_WakeUpIdle = false;
|
||||
|
||||
void wxWakeUpIdle()
|
||||
void wxApp::WakeUpIdle()
|
||||
{
|
||||
#if wxUSE_THREADS
|
||||
if (!wxThread::IsMain())
|
||||
wxMutexGuiEnter();
|
||||
#endif
|
||||
|
||||
if (g_isIdle) {
|
||||
gs_WakeUpIdle = true;
|
||||
if (g_isIdle)
|
||||
wxapp_install_idle_handler();
|
||||
gs_WakeUpIdle = false;
|
||||
}
|
||||
|
||||
#if wxUSE_THREADS
|
||||
if (!wxThread::IsMain())
|
||||
@@ -660,6 +646,13 @@ int wxApp::MainLoop()
|
||||
return 0;
|
||||
}
|
||||
|
||||
void wxApp::Exit()
|
||||
{
|
||||
// VZ: no idea why is it different from ExitMainLoop() but this is what
|
||||
// wxExit() used to do
|
||||
gtk_main_quit();
|
||||
}
|
||||
|
||||
void wxApp::ExitMainLoop()
|
||||
{
|
||||
if (gtk_main_level() > 0)
|
||||
|
Reference in New Issue
Block a user