Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp, 1.26, 1.27 wxaui_bind.cpp, 1.21, 1.22 wxbase_bind.cpp, 1.24, 1.25 wxcore_bind.cpp, 1.28, 1.29 wxgl_bind.cpp, 1.15, 1.16 wxhtml_bind.cpp, 1.18, 1.19 wxmedia_bind.cpp, 1.16, 1.17 wxnet_bind.cpp, 1.19, 1.20 wxrichtext_bind.cpp, 1.12, 1.13 wxstc_bind.cpp, 1.18, 1.19 wxxml_bind.cpp, 1.16, 1.17 wxxrc_bind.cpp, 1.15, 1.16
|
From: John L. <jr...@us...> - 2009-12-21 04:06:25
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10162/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxaui_bind.cpp wxbase_bind.cpp wxcore_bind.cpp wxgl_bind.cpp wxhtml_bind.cpp wxmedia_bind.cpp wxnet_bind.cpp wxrichtext_bind.cpp wxstc_bind.cpp wxxml_bind.cpp wxxrc_bind.cpp Log Message: Use a wxArray instead of a wxList for the wxLuaBindingArray (was List) Simplify and cleanup initializing the bindings, linking base class wxLuaBindMethods Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxbase_bind.cpp 1 Oct 2009 04:21:01 -0000 1.24 --- wxbase_bind.cpp 21 Dec 2009 04:06:12 -0000 1.25 *************** *** 2823,2826 **** --- 2823,2827 ---- m_objectArray = wxLuaGetObjectList_wxbase(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxbase(m_functionCount); + InitBinding(); } *************** *** 2847,2857 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxbase_init() { static wxLuaBinding_wxbase m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 2848,2859 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxbase_init() { static wxLuaBinding_wxbase m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxnet_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxnet_bind.cpp 1 Oct 2009 04:21:01 -0000 1.19 --- wxnet_bind.cpp 21 Dec 2009 04:06:12 -0000 1.20 *************** *** 3121,3124 **** --- 3121,3125 ---- m_objectArray = wxLuaGetObjectList_wxnet(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxnet(m_functionCount); + InitBinding(); } *************** *** 3127,3137 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxnet_init() { static wxLuaBinding_wxnet m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 3128,3139 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxnet_init() { static wxLuaBinding_wxnet m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxstc_bind.cpp 1 Oct 2009 04:21:01 -0000 1.18 --- wxstc_bind.cpp 21 Dec 2009 04:06:12 -0000 1.19 *************** *** 10295,10298 **** --- 10295,10299 ---- m_objectArray = wxLuaGetObjectList_wxstc(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxstc(m_functionCount); + InitBinding(); } *************** *** 10301,10311 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxstc_init() { static wxLuaBinding_wxstc m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 10302,10313 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxstc_init() { static wxLuaBinding_wxstc m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxgl_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxgl_bind.cpp 1 Oct 2009 04:21:01 -0000 1.15 --- wxgl_bind.cpp 21 Dec 2009 04:06:12 -0000 1.16 *************** *** 762,765 **** --- 762,766 ---- m_objectArray = wxLuaGetObjectList_wxgl(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxgl(m_functionCount); + InitBinding(); } *************** *** 768,778 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxgl_init() { static wxLuaBinding_wxgl m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 769,780 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxgl_init() { static wxLuaBinding_wxgl m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxxrc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxxrc_bind.cpp 1 Oct 2009 04:21:01 -0000 1.15 --- wxxrc_bind.cpp 21 Dec 2009 04:06:12 -0000 1.16 *************** *** 823,826 **** --- 823,827 ---- m_objectArray = wxLuaGetObjectList_wxxrc(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxxrc(m_functionCount); + InitBinding(); } *************** *** 829,839 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxxrc_init() { static wxLuaBinding_wxxrc m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 830,841 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxxrc_init() { static wxLuaBinding_wxxrc m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxmedia_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxmedia_bind.cpp 1 Oct 2009 04:21:01 -0000 1.16 --- wxmedia_bind.cpp 21 Dec 2009 04:06:12 -0000 1.17 *************** *** 799,802 **** --- 799,803 ---- m_objectArray = wxLuaGetObjectList_wxmedia(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxmedia(m_functionCount); + InitBinding(); } *************** *** 805,815 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxmedia_init() { static wxLuaBinding_wxmedia m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 806,817 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxmedia_init() { static wxLuaBinding_wxmedia m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxcore_bind.cpp 5 Oct 2009 02:51:29 -0000 1.28 --- wxcore_bind.cpp 21 Dec 2009 04:06:12 -0000 1.29 *************** *** 7201,7204 **** --- 7201,7205 ---- m_objectArray = wxLuaGetObjectList_wxcore(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxcore(m_functionCount); + InitBinding(); } *************** *** 7272,7282 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxcore_init() { static wxLuaBinding_wxcore m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 7273,7284 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxcore_init() { static wxLuaBinding_wxcore m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxadv_bind.cpp 1 Oct 2009 04:21:01 -0000 1.26 --- wxadv_bind.cpp 21 Dec 2009 04:06:11 -0000 1.27 *************** *** 16681,16684 **** --- 16681,16685 ---- m_objectArray = wxLuaGetObjectList_wxadv(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxadv(m_functionCount); + InitBinding(); } *************** *** 16687,16697 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxadv_init() { static wxLuaBinding_wxadv m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 16688,16699 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxadv_init() { static wxLuaBinding_wxadv m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxrichtext_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxrichtext_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxrichtext_bind.cpp 27 Sep 2009 03:13:55 -0000 1.12 --- wxrichtext_bind.cpp 21 Dec 2009 04:06:12 -0000 1.13 *************** *** 160,163 **** --- 160,164 ---- m_objectArray = wxLuaGetObjectList_wxrichtext(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxrichtext(m_functionCount); + InitBinding(); } *************** *** 166,176 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxrichtext_init() { static wxLuaBinding_wxrichtext m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 167,178 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxrichtext_init() { static wxLuaBinding_wxrichtext m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxhtml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_bind.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxhtml_bind.cpp 1 Oct 2009 04:21:01 -0000 1.18 --- wxhtml_bind.cpp 21 Dec 2009 04:06:12 -0000 1.19 *************** *** 5181,5184 **** --- 5181,5185 ---- m_objectArray = wxLuaGetObjectList_wxhtml(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxhtml(m_functionCount); + InitBinding(); } *************** *** 5187,5197 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxhtml_init() { static wxLuaBinding_wxhtml m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 5188,5199 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxhtml_init() { static wxLuaBinding_wxhtml m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxaui_bind.cpp 1 Oct 2009 04:21:01 -0000 1.21 --- wxaui_bind.cpp 21 Dec 2009 04:06:11 -0000 1.22 *************** *** 9266,9269 **** --- 9266,9270 ---- m_objectArray = wxLuaGetObjectList_wxaui(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxaui(m_functionCount); + InitBinding(); } *************** *** 9272,9282 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxaui_init() { static wxLuaBinding_wxaui m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 9273,9284 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxaui_init() { static wxLuaBinding_wxaui m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } Index: wxxml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxml_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxxml_bind.cpp 1 Oct 2009 04:21:01 -0000 1.16 --- wxxml_bind.cpp 21 Dec 2009 04:06:12 -0000 1.17 *************** *** 1188,1191 **** --- 1188,1192 ---- m_objectArray = wxLuaGetObjectList_wxxml(m_objectCount); m_functionArray = wxLuaGetFunctionList_wxxml(m_functionCount); + InitBinding(); } *************** *** 1194,1204 **** // --------------------------------------------------------------------------- ! bool wxLuaBinding_wxxml_init() { static wxLuaBinding_wxxml m_binding; - if (wxLuaBinding::GetBindingList()->Find(&m_binding)) return false; ! wxLuaBinding::GetBindingList()->Append(&m_binding); ! return true; } --- 1195,1206 ---- // --------------------------------------------------------------------------- ! wxLuaBinding* wxLuaBinding_wxxml_init() { static wxLuaBinding_wxxml m_binding; ! if (wxLuaBinding::GetBindingArray().Index(&m_binding) == wxNOT_FOUND) ! wxLuaBinding::GetBindingArray().Add(&m_binding); ! ! return &m_binding; } |
