mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-25 14:22:54 -06:00
bazaar: BoostPyTest: Callbacks improvements, CtrlCore / TopWindow export at 80%, virtual methods and eval examples, ValueMap export; ValueCtrl: ValueMap and ErrorValue editor
git-svn-id: svn://ultimatepp.org/upp/trunk@3421 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
kohait
parent
a5dd6dbe7b
commit
ac648bbee1
10 changed files with 730 additions and 115 deletions
|
|
@ -7,7 +7,7 @@ void export_Logc()
|
|||
{
|
||||
ONCELOCK
|
||||
{
|
||||
enum_<Ctrl::PlacementConstants>("choice")
|
||||
enum_<Ctrl::PlacementConstants>("placementcontstants")
|
||||
.value("center", Ctrl::CENTER)
|
||||
.value("middle", Ctrl::MIDDLE)
|
||||
.value("left", Ctrl::LEFT)
|
||||
|
|
@ -46,29 +46,10 @@ ONCELOCK
|
|||
}
|
||||
|
||||
//virtuals
|
||||
bool CtrlAccept(Ctrl& c) { return c.Accept(); }
|
||||
void CtrlReject(Ctrl& c) { c.Reject(); }
|
||||
|
||||
void CtrlSetModify(Ctrl& c, bool b) { if (b) c.SetModify(); else c.ClearModify(); }
|
||||
bool CtrlIsModified(const Ctrl& c) { return c.IsModified(); }
|
||||
|
||||
Size CtrlGetMinSize(Ctrl& c) { return c.GetMinSize(); }
|
||||
Size CtrlGetStdSize(Ctrl& c) { return c.GetStdSize(); }
|
||||
Rect CtrlGetVoidRect(Ctrl& c) { return c.GetVoidRect(); }
|
||||
|
||||
Value CtrlGetData(const Ctrl& c) { return c.GetData(); }
|
||||
void CtrlSetData(Ctrl& c, const Value& data) { c.SetData(data); }
|
||||
|
||||
void CtrlClose(Ctrl& c) { c.Close(); }
|
||||
|
||||
//return ignorers
|
||||
void CtrlWantFocus(Ctrl& c, bool b) { c.WantFocus(b); }
|
||||
void CtrlInitFocus(Ctrl& c, bool b) { c.InitFocus(b); }
|
||||
void CtrlSetEditable(Ctrl& c, bool b) { c.SetEditable(b); }
|
||||
void CtrlSetPos(Ctrl& c, const Ctrl::LogPos& p) { c.SetPos(p); }
|
||||
void CtrlSetTip(Ctrl& c, const String& s) { c.Tip(s); }
|
||||
void CtrlTransparent(Ctrl& c, bool b) { c.Transparent(b); }
|
||||
|
||||
void CtrlLeftPos(Ctrl& c, int a, int size) { c.LeftPos(a, size); }
|
||||
void CtrlRightPos(Ctrl& c, int a, int size) { c.RightPos(a, size); }
|
||||
void CtrlTopPos(Ctrl& c, int a, int size) { c.TopPos(a, size); }
|
||||
|
|
@ -79,17 +60,143 @@ void CtrlHCenterPos(Ctrl& c, int size, int delta) { c.HCenterPos(size, delta); }
|
|||
void CtrlVCenterPos(Ctrl& c, int size, int delta) { c.HCenterPos(size, delta); }
|
||||
void CtrlSizePos(Ctrl& c) { c.SizePos(); }
|
||||
|
||||
void CtrlLeftPosZ(Ctrl& c, int a, int size) { c.LeftPosZ(a, size); }
|
||||
void CtrlRightPosZ(Ctrl& c, int a, int size) { c.RightPosZ(a, size); }
|
||||
void CtrlTopPosZ(Ctrl& c, int a, int size) { c.TopPosZ(a, size); }
|
||||
void CtrlBottomPosZ(Ctrl& c, int a, int size) { c.BottomPosZ(a, size); }
|
||||
void CtrlHSizePosZ(Ctrl& c, int a, int b) { c.HSizePosZ(a, b); }
|
||||
void CtrlVSizePosZ(Ctrl& c, int a, int b) { c.VSizePosZ(a, b); }
|
||||
void CtrlHCenterPosZ(Ctrl& c, int size, int delta) { c.HCenterPosZ(size, delta); }
|
||||
void CtrlVCenterPosZ(Ctrl& c, int size, int delta) { c.HCenterPosZ(size, delta); }
|
||||
|
||||
void CtrlIgnoreMouse(Ctrl& c, bool b) { c.IgnoreMouse(b); }
|
||||
void CtrlWantFocus(Ctrl& c, bool b) { c.WantFocus(b); }
|
||||
void CtrlInitFocus(Ctrl& c, bool b) { c.InitFocus(b); }
|
||||
void CtrlSetEditable(Ctrl& c, bool b) { c.SetEditable(b); }
|
||||
void CtrlSetPos(Ctrl& c, const Ctrl::LogPos& p) { c.SetPos(p); }
|
||||
void CtrlSetTip(Ctrl& c, const String& s) { c.Tip(s); }
|
||||
void CtrlTransparent(Ctrl& c, bool b) { c.Transparent(b); }
|
||||
|
||||
void CtrlSetInfo(Ctrl& c, const String& s) { c.Info(s); }
|
||||
|
||||
//other
|
||||
void CtrlSetCapture(Ctrl& c, bool b) { if(b) c.SetCapture(); else c.ReleaseCapture(); }
|
||||
void CtrlSetFocus(Ctrl& c, bool b) { if(b) c.SetFocus(); else if(c.GetParent()) c.GetParent()->SetFocus(); }
|
||||
void CtrlSetBackPaint(Ctrl& c, bool b) { c.BackPaint(b?(Ctrl::FULLBACKPAINT):(Ctrl::NOBACKPAINT)); }
|
||||
bool CtrlIsBackPaint(const Ctrl& c) { return (c.GetBackPaint()!=Ctrl::NOBACKPAINT); }
|
||||
|
||||
String CtrlToString(const Ctrl& c)
|
||||
{
|
||||
return c.Name();
|
||||
return String().Cat() << String(typeid(c).name()) << ": " << AsString(c.GetData());
|
||||
}
|
||||
|
||||
//
|
||||
enum PaintEnum {
|
||||
_NOBACKPAINT = Ctrl::NOBACKPAINT,
|
||||
_FULLBACKPAINT = Ctrl::FULLBACKPAINT,
|
||||
_TRANSPARENTBACKPAINT = Ctrl::TRANSPARENTBACKPAINT,
|
||||
_EXCLUDEPAINT = Ctrl::EXCLUDEPAINT,
|
||||
};
|
||||
|
||||
class CtrlWrap : public Ctrl, public wrapper<Ctrl> {
|
||||
public:
|
||||
typedef Ctrl C;
|
||||
|
||||
virtual bool Accept() { if(override f = this->get_override("accept")) return f(); return C::Accept(); }
|
||||
bool default_Accept() { return C::Accept(); }
|
||||
|
||||
virtual void Reject() { if(override f = this->get_override("reject")) f(); C::Reject(); }
|
||||
void default_Reject() { C::Reject(); }
|
||||
|
||||
virtual void SetData(const Value& data) { if(override f = this->get_override("setdata")) f(data); C::SetData(data); }
|
||||
void default_SetData(const Value& data) { C::SetData(data); }
|
||||
|
||||
virtual Value GetData() const { if(override f = this->get_override("getdata")) return f(); return C::GetData(); }
|
||||
Value default_GetData() const { return C::GetData(); }
|
||||
|
||||
virtual void SetModify() { if(override f = this->get_override("setmodify")) f(); C::SetModify(); }
|
||||
void default_SetModify() { C::SetModify(); }
|
||||
|
||||
virtual void ClearModify() { if(override f = this->get_override("clearmodify")) f(); C::ClearModify(); }
|
||||
void default_ClearModify() { C::ClearModify(); }
|
||||
|
||||
virtual bool IsModified() const { if(override f = this->get_override("ismodified")) return f(); return C::IsModified(); }
|
||||
bool default_IsModified() const { return C::IsModified(); }
|
||||
|
||||
virtual void CancelMode() { if(override f = this->get_override("cancelmode")) f(); C::CancelMode(); }
|
||||
void default_CancelMode() { C::CancelMode(); }
|
||||
|
||||
virtual void Activate() { if(override f = this->get_override("activate")) f(); C::Activate(); }
|
||||
void default_Activate() { C::Activate(); }
|
||||
|
||||
virtual void Deactivate() { if(override f = this->get_override("deactivate")) f(); C::Deactivate(); }
|
||||
void default_Deactivate() { C::Deactivate(); }
|
||||
|
||||
virtual void LeftDown(Point p, dword keyflags) { if(override f = this->get_override("leftdown")) f(p, keyflags); C::LeftDown(p, keyflags); }
|
||||
void default_LeftDown(Point p, dword keyflags) { C::LeftDown(p, keyflags); }
|
||||
|
||||
//more of interface to come
|
||||
|
||||
virtual bool Key(dword key, int count) { if(override f = this->get_override("key")) return f(key, count); return C::Key(key, count); }
|
||||
bool default_Key(dword key, int count) { return C::Key(key, count); }
|
||||
|
||||
virtual void GotFocus() { if(override f = this->get_override("gotfocus")) f(); C::GotFocus(); }
|
||||
void default_GotFocus() { C::GotFocus(); }
|
||||
|
||||
virtual void LostFocus() { if(override f = this->get_override("lostfocus")) f(); C::LostFocus(); }
|
||||
void default_LostFocus() { C::LostFocus(); }
|
||||
|
||||
virtual void ChildGotFocus() { if(override f = this->get_override("childgotfocus")) f(); C::ChildGotFocus(); }
|
||||
void default_ChildGotFocus() { C::ChildGotFocus(); }
|
||||
|
||||
virtual void ChildLostFocus() { if(override f = this->get_override("childlostfocus")) f(); C::ChildLostFocus(); }
|
||||
void default_ChildLostFocus() { C::ChildLostFocus(); }
|
||||
|
||||
virtual void ChildAdded(Ctrl *child) { if(override f = this->get_override("childadded")) f(child); C::ChildAdded(child); }
|
||||
void default_ChildAdded(Ctrl *child) { C::ChildAdded(child); }
|
||||
|
||||
virtual void ChildRemoved(Ctrl *child) { if(override f = this->get_override("childremoved")) f(child); C::ChildRemoved(child); }
|
||||
void default_ChildRemoved(Ctrl *child) { C::ChildRemoved(child); }
|
||||
|
||||
virtual void State(int reason) { if(override f = this->get_override("state")) f(reason); C::State(reason); }
|
||||
void default_State(int reason) { C::State(reason); }
|
||||
|
||||
virtual void Layout() { if(override f = this->get_override("layout")) f(); C::Layout(); }
|
||||
void default_Layout() { C::Layout(); }
|
||||
|
||||
virtual Size GetMinSize() const { if(override f = this->get_override("getminsize")) return f(); return C::GetMinSize(); }
|
||||
Size default_GetMinSize() const { return C::GetMinSize(); }
|
||||
|
||||
virtual Size GetStdSize() const { if(override f = this->get_override("getstdsize")) return f(); return C::GetStdSize(); }
|
||||
Size default_GetStdSize() const { return C::GetStdSize(); }
|
||||
|
||||
virtual Size GetMaxSize() const { if(override f = this->get_override("getmaxsize")) return f(); return C::GetMaxSize(); }
|
||||
Size default_GetMaxSize() const { return C::GetMaxSize(); }
|
||||
|
||||
virtual bool IsShowEnabled() const { if(override f = this->get_override("isshowenabled")) return f(); return C::IsShowEnabled(); }
|
||||
bool default_IsShowEnabled() const { return C::IsShowEnabled(); }
|
||||
|
||||
virtual Rect GetOpaqueRect() const { if(override f = this->get_override("getopaquerect")) return f(); return C::GetOpaqueRect(); }
|
||||
Rect default_GetOpaqueRect() const { return C::GetOpaqueRect(); }
|
||||
|
||||
virtual Rect GetVoidRect() const { if(override f = this->get_override("getvoidrect")) return f(); return C::GetVoidRect(); }
|
||||
Rect default_GetVoidRect() const { return C::GetVoidRect(); }
|
||||
|
||||
virtual void Updated() { if(override f = this->get_override("updated")) f(); C::Updated(); }
|
||||
void default_Updated() { C::Updated(); }
|
||||
|
||||
virtual void Close() { if(override f = this->get_override("close")) f(); C::Close(); }
|
||||
void default_Close() { C::Close(); }
|
||||
|
||||
virtual String GetDesc() const { if(override f = this->get_override("getdesc")) return f(); return C::GetDesc(); }
|
||||
String default_GetDesc() const { return C::GetDesc(); }
|
||||
|
||||
#ifdef _DEBUG
|
||||
virtual void Dump() const { if(override f = this->get_override("dump")) f(); C::Dump(); }
|
||||
void default_Dump() const { C::Dump(); }
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
void export_CtrlCore()
|
||||
{
|
||||
|
|
@ -97,7 +204,71 @@ ONCELOCK
|
|||
{
|
||||
export_Core();
|
||||
export_LogPos();
|
||||
class_<Ctrl, boost::noncopyable>("Ctrl", "Upp Ctrl")
|
||||
|
||||
enum_<Ctrl::StateReason>("statereason")
|
||||
.value("focus", Ctrl::FOCUS)
|
||||
.value("activate", Ctrl::ACTIVATE)
|
||||
.value("deactivate", Ctrl::DEACTIVATE)
|
||||
.value("show", Ctrl::SHOW)
|
||||
.value("enable", Ctrl::ENABLE)
|
||||
.value("editable", Ctrl::EDITABLE)
|
||||
.value("open", Ctrl::OPEN)
|
||||
.value("close", Ctrl::CLOSE)
|
||||
.value("position", Ctrl::POSITION)
|
||||
.value("layoutpos", Ctrl::LAYOUTPOS)
|
||||
;
|
||||
|
||||
enum_<Ctrl::MouseEvents>("mouseevents")
|
||||
.value("button", Ctrl::BUTTON)
|
||||
.value("action", Ctrl::ACTION)
|
||||
|
||||
.value("mouseenter", Ctrl::MOUSEENTER)
|
||||
.value("mousemove", Ctrl::MOUSEMOVE)
|
||||
.value("mouseleave", Ctrl::MOUSELEAVE)
|
||||
.value("cursorimage", Ctrl::CURSORIMAGE)
|
||||
.value("mousewheel", Ctrl::MOUSEWHEEL)
|
||||
|
||||
.value("down", Ctrl::DOWN)
|
||||
.value("up", Ctrl::UP)
|
||||
.value("double", Ctrl::DOUBLE)
|
||||
.value("repeat", Ctrl::REPEAT)
|
||||
.value("drag", Ctrl::DRAG)
|
||||
.value("hold", Ctrl::HOLD)
|
||||
.value("tripple", Ctrl::TRIPLE)
|
||||
|
||||
.value("leftbutton", Ctrl::LEFTDOWN)
|
||||
.value("leftdouble", Ctrl::LEFTDOUBLE)
|
||||
.value("leftrepeat", Ctrl::LEFTREPEAT)
|
||||
.value("leftup", Ctrl::LEFTUP)
|
||||
.value("leftdrag", Ctrl::LEFTDRAG)
|
||||
.value("lefthold", Ctrl::LEFTHOLD)
|
||||
.value("lefttripple", Ctrl::LEFTTRIPLE)
|
||||
|
||||
.value("rightdown", Ctrl::RIGHTDOWN)
|
||||
.value("rightdouble", Ctrl::RIGHTDOUBLE)
|
||||
.value("rightrepeat", Ctrl::RIGHTREPEAT)
|
||||
.value("rightup", Ctrl::RIGHTUP)
|
||||
.value("rightdrag", Ctrl::RIGHTDRAG)
|
||||
.value("righthold", Ctrl::RIGHTHOLD)
|
||||
.value("righttripple", Ctrl::RIGHTTRIPLE)
|
||||
|
||||
.value("middledown", Ctrl::MIDDLEDOWN)
|
||||
.value("middledouble", Ctrl::MIDDLEDOUBLE)
|
||||
.value("middlerepeat", Ctrl::MIDDLEREPEAT)
|
||||
.value("middleup", Ctrl::MIDDLEUP)
|
||||
.value("middledrag", Ctrl::MIDDLEDRAG)
|
||||
.value("middlehold", Ctrl::MIDDLEHOLD)
|
||||
.value("middletripple", Ctrl::MIDDLETRIPLE)
|
||||
;
|
||||
|
||||
enum_<PaintEnum>("paintenum")
|
||||
.value("nobackpaint", _NOBACKPAINT)
|
||||
.value("fullbackpaint", _FULLBACKPAINT)
|
||||
.value("transparentbackpaint", _TRANSPARENTBACKPAINT)
|
||||
.value("excludepaint", _EXCLUDEPAINT)
|
||||
;
|
||||
|
||||
class_<CtrlWrap, boost::noncopyable>("Ctrl", "Upp Ctrl")
|
||||
|
||||
.def("posleft", &Ctrl::PosLeft)
|
||||
.staticmethod("posleft")
|
||||
|
|
@ -112,26 +283,91 @@ ONCELOCK
|
|||
.def("poscenter", (Ctrl::Logc (*)(int, int))&Ctrl::PosCenter)
|
||||
.staticmethod("poscenter")
|
||||
|
||||
.def("accept", &CtrlAccept)
|
||||
.def("reject", &CtrlReject)
|
||||
.def("accept", &Ctrl::Accept, &CtrlWrap::default_Accept)
|
||||
.def("reject", &Ctrl::Reject, &CtrlWrap::default_Reject)
|
||||
|
||||
.def("setdata", &Ctrl::SetData, &CtrlWrap::default_SetData)
|
||||
.def("getdata", &Ctrl::GetData, &CtrlWrap::default_GetData)
|
||||
.add_property("data", &CtrlGetData, &CtrlSetData) //FIXME is not how it should work, but for testing the C++ side interface
|
||||
|
||||
.def("setmodify", &Ctrl::SetModify, &CtrlWrap::default_SetModify)
|
||||
.def("clearmodify", &Ctrl::ClearModify, &CtrlWrap::default_ClearModify)
|
||||
.def("ismodified", &Ctrl::IsModified, &CtrlWrap::default_IsModified)
|
||||
.def("resetmodify", &Ctrl::ResetModify)
|
||||
.def("ismodifiedset", &Ctrl::IsModifySet)
|
||||
|
||||
.def("cancelmode", &Ctrl::CancelMode, &CtrlWrap::default_CancelMode)
|
||||
.def("activate", &Ctrl::Activate, &CtrlWrap::default_Activate)
|
||||
.def("deactivate", &Ctrl::Deactivate, &CtrlWrap::default_Deactivate)
|
||||
|
||||
.def("leftdown", &Ctrl::LeftDown, &CtrlWrap::default_LeftDown)
|
||||
//...
|
||||
.def("key", &Ctrl::Key, &CtrlWrap::default_Key)
|
||||
|
||||
.def("gotfocus", &Ctrl::GotFocus, &CtrlWrap::default_GotFocus)
|
||||
.def("lostfocus", &Ctrl::LostFocus, &CtrlWrap::default_LostFocus)
|
||||
|
||||
.def("childgotfocus", &Ctrl::ChildGotFocus, &CtrlWrap::default_ChildGotFocus)
|
||||
.def("childlostfocus", &Ctrl::ChildLostFocus, &CtrlWrap::default_ChildLostFocus)
|
||||
.def("childadded", &Ctrl::ChildAdded, &CtrlWrap::default_ChildAdded)
|
||||
.def("childremoved", &Ctrl::ChildRemoved, &CtrlWrap::default_ChildRemoved)
|
||||
|
||||
.def("state", &Ctrl::State, &CtrlWrap::default_State)
|
||||
.def("layout", &Ctrl::Layout, &CtrlWrap::default_Layout)
|
||||
|
||||
.def("getminsize", &Ctrl::GetMinSize, &CtrlWrap::default_GetMinSize)
|
||||
.def("getstdsize", &Ctrl::GetStdSize, &CtrlWrap::default_GetStdSize)
|
||||
.def("getminsize", &Ctrl::GetMaxSize, &CtrlWrap::default_GetMaxSize)
|
||||
|
||||
.def("isshowenabled", &Ctrl::IsShowEnabled, &CtrlWrap::default_IsShowEnabled)
|
||||
|
||||
.def("getopaquerect", &Ctrl::GetOpaqueRect, &CtrlWrap::default_GetOpaqueRect)
|
||||
.def("getvoidrect", &Ctrl::GetVoidRect, &CtrlWrap::default_GetVoidRect)
|
||||
|
||||
.def("updated", &Ctrl::Updated, &CtrlWrap::default_Updated)
|
||||
.def("close", &Ctrl::Close, &CtrlWrap::default_Close)
|
||||
|
||||
.def("getdesc", &Ctrl::GetDesc, &CtrlWrap::default_GetDesc)
|
||||
|
||||
.add_property("data", &CtrlGetData, &CtrlSetData)
|
||||
.def_readwrite("whenaction", &Ctrl::WhenAction)
|
||||
|
||||
.add_property("modify", &CtrlIsModified, &CtrlSetModify)
|
||||
.def("resetmodify", &Ctrl::ResetModify)
|
||||
.def("addchild", (void (Ctrl::*)(Ctrl*))&Ctrl::AddChild)
|
||||
.def("addchildafter", (void (Ctrl::*)(Ctrl*, Ctrl*))&Ctrl::AddChild)
|
||||
.def("addchildbefore", &Ctrl::AddChildBefore)
|
||||
.def("removechild", &Ctrl::RemoveChild)
|
||||
|
||||
/// dangerous, since it doesnt care where the objects are owned..this info gets lost in python then.
|
||||
/// if the object is detroyd the object created from these calls in python wont know, and crash
|
||||
.def("getparent", &Ctrl::GetParent, return_value_policy<reference_existing_object>())
|
||||
.def("getfirstchild", &Ctrl::GetFirstChild, return_value_policy<reference_existing_object>())
|
||||
.def("getlastchild", &Ctrl::GetLastChild, return_value_policy<reference_existing_object>())
|
||||
.def("getnext", &Ctrl::GetNext, return_value_policy<reference_existing_object>())
|
||||
.def("getprev", &Ctrl::GetPrev, return_value_policy<reference_existing_object>())
|
||||
///
|
||||
.def("ischild", &Ctrl::IsChild)
|
||||
|
||||
.add_property("foreground", &Ctrl::IsForeground, &Ctrl::SetForeground)
|
||||
|
||||
.def("childfrompoint", &Ctrl::ChildFromPoint, return_value_policy<reference_existing_object>())
|
||||
|
||||
.add_property("isopen", &Ctrl::IsOpen)
|
||||
|
||||
.def("shutdown", &Ctrl::Shutdown)
|
||||
.def("isshutdown", &Ctrl::IsShutdown)
|
||||
|
||||
.add_property("pos", &Ctrl::GetPos, &CtrlSetPos)
|
||||
.add_property("rect", &Ctrl::GetRect, (void (Ctrl::*)(const Rect&))&Ctrl::SetRect)
|
||||
.add_property("size", &Ctrl::GetSize)
|
||||
|
||||
.add_property("minsize", &CtrlGetMinSize)
|
||||
.add_property("stdsize", &CtrlGetStdSize)
|
||||
.add_property("voidrect", &CtrlGetVoidRect)
|
||||
|
||||
.add_property("inview", &Ctrl::InView)
|
||||
.add_property("inframe", &Ctrl::InFrame)
|
||||
|
||||
.def("refreshlayout", &Ctrl::RefreshLayout)
|
||||
.def("refreshlayoutdeep", &Ctrl::RefreshLayoutDeep)
|
||||
.def("refreshparentlayout", &Ctrl::RefreshParentLayout)
|
||||
.def("updatelayout", &Ctrl::UpdateLayout)
|
||||
.def("updateparentlayout", &Ctrl::UpdateParentLayout)
|
||||
|
||||
.def("leftpos", &CtrlLeftPos)
|
||||
.def("rightpos", &CtrlRightPos)
|
||||
.def("toppos", &CtrlTopPos)
|
||||
|
|
@ -142,32 +378,62 @@ ONCELOCK
|
|||
.def("vcenterpos", &CtrlVCenterPos)
|
||||
.def("sizepos", &CtrlSizePos)
|
||||
|
||||
.def("leftposz", &CtrlLeftPosZ)
|
||||
.def("rightposz", &CtrlRightPosZ)
|
||||
.def("topposz", &CtrlTopPosZ)
|
||||
.def("bottomposz", &CtrlBottomPosZ)
|
||||
.def("hsizeposz", &CtrlHSizePosZ)
|
||||
.def("vsizeposz", &CtrlVSizePosZ)
|
||||
.def("hcenterposz", &CtrlHCenterPosZ)
|
||||
.def("vcenterposz", &CtrlVCenterPosZ)
|
||||
|
||||
.def("getscreenrect", &Ctrl::GetScreenRect)
|
||||
.def("getview", &Ctrl::GetView)
|
||||
.def("getscreenview", &Ctrl::GetScreenView)
|
||||
.def("getvisiblescreenrect", &Ctrl::GetVisibleScreenRect)
|
||||
.def("getvisiblescreenview", &Ctrl::GetVisibleScreenView)
|
||||
.def("getworkarea", (Rect (Ctrl::*)() const)&Ctrl::GetWorkArea)
|
||||
|
||||
.def("refresh", (void (Ctrl::*)())&Ctrl::Refresh)
|
||||
.def("isfullrefresh", &Ctrl::IsFullRefresh)
|
||||
|
||||
.def("sync", (void (Ctrl::*)())&Ctrl::Sync)
|
||||
|
||||
//.add_property("ignoremouse", &Ctrl::IgnoreMouse, &CtrlIgnoreMouse)
|
||||
.add_property("capture", &Ctrl::HasCapture, &CtrlSetCapture)
|
||||
.add_property("focus", &Ctrl::HasFocus, &CtrlSetFocus)
|
||||
.add_property("wantfocus", &CtrlWantFocus, &Ctrl::IsWantFocus)
|
||||
.def("hasfocusdeep", &Ctrl::HasFocusDeep)
|
||||
.add_property("wantfocus", &Ctrl::IsWantFocus, &CtrlWantFocus)
|
||||
.add_property("initfocus", &Ctrl::IsInitFocus, &CtrlInitFocus)
|
||||
|
||||
.def("cancelmodedeep", &Ctrl::CancelModeDeep)
|
||||
|
||||
.add_property("show", &Ctrl::IsVisible, &Ctrl::Show)
|
||||
.add_property("shown", &Ctrl::IsShown)
|
||||
.add_property("enable", &Ctrl::IsEnabled, &Ctrl::Enable)
|
||||
.add_property("edit", &Ctrl::IsEditable, &CtrlSetEditable)
|
||||
|
||||
.def("updaterefresh", &Ctrl::UpdateRefresh)
|
||||
.def("update", &Ctrl::Update)
|
||||
.def("action", &Ctrl::Action)
|
||||
.def("refresh", (void (Ctrl::*)(void))&Ctrl::Refresh)
|
||||
|
||||
.def("close", &CtrlClose)
|
||||
.add_property("isopen", &Ctrl::IsOpen)
|
||||
|
||||
.def("updateaction", &Ctrl::UpdateAction)
|
||||
.def("updateactionrefresh", &Ctrl::UpdateActionRefresh)
|
||||
|
||||
.add_property("backpaint", &CtrlIsBackPaint, &CtrlSetBackPaint)
|
||||
.add_property("transparent", &Ctrl::IsTransparent, &CtrlTransparent)
|
||||
|
||||
.add_property("info", &Ctrl::GetInfo, &CtrlSetInfo)
|
||||
.add_property("tip", &Ctrl::GetTip, &CtrlSetTip)
|
||||
|
||||
.def("add", &Ctrl::Add)
|
||||
.def("addchild", (void (Ctrl::*)(Ctrl*))&Ctrl::AddChild)
|
||||
.def("addchildafter", (void (Ctrl::*)(Ctrl*, Ctrl*))&Ctrl::AddChild)
|
||||
.def("addchildbefore", &Ctrl::AddChildBefore)
|
||||
.def("remove", &Ctrl::Remove)
|
||||
|
||||
.def("setalpha", &Ctrl::SetAlpha)
|
||||
.def("ispopup", &Ctrl::IsPopUp)
|
||||
|
||||
#ifdef _DEBUG
|
||||
.def("dump", (void (Ctrl::*)() const)&Ctrl::Dump, &CtrlWrap::default_Dump)
|
||||
#endif
|
||||
.def("__str__", &CtrlToString)
|
||||
;
|
||||
|
||||
|
|
@ -175,6 +441,44 @@ ONCELOCK
|
|||
}
|
||||
}
|
||||
|
||||
class TopWindowWrap : public TopWindow, public wrapper<TopWindow> {
|
||||
public:
|
||||
typedef TopWindow C;
|
||||
|
||||
virtual bool Accept() { if(override f = this->get_override("accept")) return f(); return C::Accept(); }
|
||||
bool default_Accept() { return C::Accept(); }
|
||||
|
||||
virtual void Reject() { if(override f = this->get_override("reject")) f(); C::Reject(); }
|
||||
void default_Reject() { C::Reject(); }
|
||||
|
||||
virtual void Activate() { if(override f = this->get_override("activate")) f(); C::Activate(); }
|
||||
void default_Activate() { C::Activate(); }
|
||||
|
||||
virtual void Deactivate() { if(override f = this->get_override("deactivate")) f(); C::Deactivate(); }
|
||||
void default_Deactivate() { C::Deactivate(); }
|
||||
|
||||
virtual bool Key(dword key, int count) { if(override f = this->get_override("key")) return f(); return C::Key(key, count); }
|
||||
bool default_Key(dword key, int count) { return C::Key(key, count); }
|
||||
|
||||
virtual Size GetMinSize() const { if(override f = this->get_override("getminsize")) return f(); return C::GetMinSize(); }
|
||||
Size default_GetMinSize() const { return C::GetMinSize(); }
|
||||
|
||||
virtual Size GetStdSize() const { if(override f = this->get_override("getstdsize")) return f(); return C::GetStdSize(); }
|
||||
Size default_GetStdSize() const { return C::GetStdSize(); }
|
||||
|
||||
virtual bool IsShowEnabled() const { if(override f = this->get_override("isshowenabled")) return f(); return C::IsShowEnabled(); }
|
||||
bool default_IsShowEnabled() const { return C::IsShowEnabled(); }
|
||||
|
||||
virtual void Close() { if(override f = this->get_override("close")) f(); C::Close(); }
|
||||
void default_Close() { C::Close(); }
|
||||
|
||||
virtual void ChildGotFocus() { if(override f = this->get_override("childgotfocus")) f(); C::ChildGotFocus(); }
|
||||
void default_ChildGotFocus() { C::ChildGotFocus(); }
|
||||
|
||||
virtual String GetDesc() const { if(override f = this->get_override("getdesc")) return f(); return C::GetDesc(); }
|
||||
String default_GetDesc() const { return C::GetDesc(); }
|
||||
};
|
||||
|
||||
//virtuals
|
||||
void TopWindowClose(TopWindow& c) { c.Close(); }
|
||||
|
||||
|
|
@ -220,7 +524,22 @@ ONCELOCK
|
|||
.value("idexit", _IDEXIT)
|
||||
;
|
||||
|
||||
class_<TopWindow, bases<Ctrl>, boost::noncopyable>("TopWindow", "Upp TopWindow", no_init)
|
||||
class_<TopWindowWrap, bases<Ctrl>, boost::noncopyable>("TopWindow", "Upp TopWindow", no_init)
|
||||
|
||||
.def("accept", &TopWindow::Accept, &TopWindowWrap::default_Accept)
|
||||
.def("reject", &TopWindow::Reject, &TopWindowWrap::default_Reject)
|
||||
.def("activate", &TopWindow::Activate, &TopWindowWrap::default_Activate)
|
||||
.def("deactivate", &TopWindow::Deactivate, &TopWindowWrap::default_Deactivate)
|
||||
.def("key", &TopWindow::Key, &TopWindowWrap::default_Key)
|
||||
.def("getminsize", &TopWindow::GetMinSize, &TopWindowWrap::default_GetMinSize)
|
||||
.def("getstdsize", &TopWindow::GetStdSize, &TopWindowWrap::default_GetStdSize)
|
||||
.def("isshowenabled", &TopWindow::IsShowEnabled, &TopWindowWrap::default_IsShowEnabled)
|
||||
.def("close", &TopWindow::Close, &TopWindowWrap::default_Close)
|
||||
.def("getdesc", &TopWindow::GetDesc, &TopWindowWrap::default_GetDesc)
|
||||
.def("childgotfocus", &TopWindow::ChildGotFocus, &TopWindowWrap::default_ChildGotFocus)
|
||||
|
||||
.def_readwrite("whenclose", &TopWindow::WhenClose)
|
||||
|
||||
.def("backup", &TopWindow::Backup)
|
||||
.def("restore", &TopWindow::Restore)
|
||||
.def("break", &TopWindow::Break)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue