Update of /cvsroot/wxlua/wxLua/samples
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10162/wxLua/samples
Modified Files:
bindings.wx.lua controls.wx.lua
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: controls.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** controls.wx.lua 5 Oct 2009 02:51:29 -0000 1.20
--- controls.wx.lua 21 Dec 2009 04:06:14 -0000 1.21
***************
*** 341,345 ****
function OnEvent(event)
local skip = true
! local evtClassName = wxlua.typename(wxEVT_TableByType[event:GetEventType()].wxluatype)
local evtTypeStr = wxEVT_TableByType[event:GetEventType()].name
--- 341,345 ----
function OnEvent(event)
local skip = true
! local evtClassName = wxlua.type(event)
local evtTypeStr = wxEVT_TableByType[event:GetEventType()].name
Index: bindings.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** bindings.wx.lua 1 Oct 2009 04:21:02 -0000 1.26
--- bindings.wx.lua 21 Dec 2009 04:06:14 -0000 1.27
***************
*** 293,297 ****
-- subtract values from high to low value
- t = HasBit(t, wxlua.WXLUAMETHOD_CHECKED_OVERLOAD, nil, nil) -- nobody should care about this
t = HasBit(t, wxlua.WXLUAMETHOD_DELETE, s, "Delete")
t = HasBit(t, wxlua.WXLUAMETHOD_STATIC, s, "Static")
--- 293,296 ----
***************
*** 304,310 ****
assert(t == 0, "The wxLuaMethod_Type is not handled correctly, remainder "..tostring(t).." of "..tostring(t_))
- -- remove this, nobody should care and it'll probably be confusing
- t = HasBit(t_, wxlua.WXLUAMETHOD_CHECKED_OVERLOAD, nil, nil)
-
return string.format("0x%04X (%s)", t, table.concat(s, ", "))
end
--- 303,306 ----
|
