From 5ea6071ff70daabc9e1591f03082e8cec6c41823 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 17 May 2009 13:26:51 +0000
Subject: [PATCH] Ctrl::Call in X11 (and Windows and EventLoops in non-main
 threads)

git-svn-id: svn://ultimatepp.org/upp/trunk@1203 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/TopWinX11.cpp | 2 +-
 uppsrc/CtrlCore/X11App.cpp    | 4 ++++
 uppsrc/CtrlCore/X11Wnd.cpp    | 8 ++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/uppsrc/CtrlCore/TopWinX11.cpp b/uppsrc/CtrlCore/TopWinX11.cpp
index 9f7dbcb7a..deea6f181 100644
--- a/uppsrc/CtrlCore/TopWinX11.cpp
+++ b/uppsrc/CtrlCore/TopWinX11.cpp
@@ -77,7 +77,7 @@ void TopWindow::DefSyncTitle()
 	}
 }
 
-void TopWindow::SyncTitle()
+void TopWindow::SyncTitle0()
 {
 	GuiLock __; 
 	LLOG("SyncTitle: " << title);
diff --git a/uppsrc/CtrlCore/X11App.cpp b/uppsrc/CtrlCore/X11App.cpp
index 9cdd7be12..6e0438702 100644
--- a/uppsrc/CtrlCore/X11App.cpp
+++ b/uppsrc/CtrlCore/X11App.cpp
@@ -370,6 +370,10 @@ void SetX11ErrorHandler()
 	XSetErrorHandler(X11ErrorHandler);
 }
 
+void WakeUpGuiThread()
+{
+}
+
 void Ctrl::InitX11(const char *display)
 {
 	GuiLock __; 
diff --git a/uppsrc/CtrlCore/X11Wnd.cpp b/uppsrc/CtrlCore/X11Wnd.cpp
index 5acb5811a..c1ed0fa09 100644
--- a/uppsrc/CtrlCore/X11Wnd.cpp
+++ b/uppsrc/CtrlCore/X11Wnd.cpp
@@ -300,9 +300,10 @@ bool Ctrl::ProcessEvents(bool *)
 	return false;
 }
 
-void Ctrl::GuiSleep0(int ms)
+void Ctrl::GuiSleep(int ms)
 {
 	GuiLock __;
+	ASSERT(IsMainThread());
 	fd_set fdset;
 	FD_ZERO(&fdset);
 	FD_SET(Xconnection, &fdset);
@@ -315,11 +316,6 @@ void Ctrl::GuiSleep0(int ms)
 	EnterGuiMutex(level);
 }
 
-void Ctrl::GuiSleep(int ms)
-{
-	Call(&Ctrl::GuiSleep0, ms);
-}
-
 static int granularity = 10;
 
 void Ctrl::SetTimerGranularity(int ms)