From 890795697c84912920850536efc9870d6668d261 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 4 Dec 2012 19:36:42 +0000 Subject: [PATCH] uppsrc: Rainbow support for breaking event loop git-svn-id: svn://ultimatepp.org/upp/trunk@5623 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/CtrlCore.h | 2 ++ uppsrc/CtrlCore/CtrlTimer.cpp | 1 + uppsrc/CtrlCore/Win32Wnd.cpp | 4 ++++ uppsrc/CtrlCore/X11Wnd.cpp | 4 ++++ 4 files changed, 11 insertions(+) diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h index 7cb2ee88d..336ac85f4 100644 --- a/uppsrc/CtrlCore/CtrlCore.h +++ b/uppsrc/CtrlCore/CtrlCore.h @@ -636,6 +636,8 @@ private: static void GuiSleep0(int ms); + void SysEndLoop(); + static void InitTimer(); static String appname; diff --git a/uppsrc/CtrlCore/CtrlTimer.cpp b/uppsrc/CtrlCore/CtrlTimer.cpp index bb485c12a..68e8c3c4e 100644 --- a/uppsrc/CtrlCore/CtrlTimer.cpp +++ b/uppsrc/CtrlCore/CtrlTimer.cpp @@ -185,6 +185,7 @@ void Ctrl::EndLoop() { GuiLock __; inloop = false; + SysEndLoop(); } void Ctrl::EndLoop(int code) diff --git a/uppsrc/CtrlCore/Win32Wnd.cpp b/uppsrc/CtrlCore/Win32Wnd.cpp index fdb1f0094..352bcf9c0 100644 --- a/uppsrc/CtrlCore/Win32Wnd.cpp +++ b/uppsrc/CtrlCore/Win32Wnd.cpp @@ -863,6 +863,10 @@ bool Ctrl::ProcessEvent(bool *quit) return false; } +void Ctrl::SysEndLoop() +{ +} + bool Ctrl::ProcessEvents(bool *quit) { if(ProcessEvent(quit)) { diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp index 66258d610..74ed984b5 100644 --- a/uppsrc/CtrlCore/X11Wnd.cpp +++ b/uppsrc/CtrlCore/X11Wnd.cpp @@ -413,6 +413,10 @@ void Ctrl::SetTimerGranularity(int ms) granularity = ms; } +void Ctrl::SysEndLoop() +{ +} + void Ctrl::EventLoop0(Ctrl *ctrl) { GuiLock __;