CtrlCore: New MT rules implemented in X11 and GTK

git-svn-id: svn://ultimatepp.org/upp/trunk@6170 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-07-06 12:32:06 +00:00
parent a5cc4e2902
commit 8f9bfcc8e3
9 changed files with 59 additions and 64 deletions

View file

@ -9,7 +9,7 @@ NAMESPACE_UPP
void Ctrl::Create(Ctrl *owner, bool popup)
{
GuiLock __;
ASSERT(IsMainThread());
ASSERT_(IsMainThread(), "Only the main thread can open a window");
LLOG("Create " << Name() << " " << GetRect());
ASSERT(!IsChild() && !IsOpen());
LLOG("Ungrab1");
@ -117,12 +117,7 @@ void Ctrl::GuiPlatformRemove()
i++;
}
void Ctrl::PopUp(Ctrl *owner, bool savebits, bool activate, bool dropshadow, bool topmost)
{
Call(callback2(this, &Ctrl::PopUp0, owner, activate));
}
void Ctrl::PopUp0(Ctrl *owner, bool activate)
void Ctrl::PopUp(Ctrl *owner, bool savebits, bool activate, bool, bool)
{
GuiLock __;
LLOG("POPUP " << Name() << ", " << GetRect() << ", activate " << activate);