Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19140/wxLua/bindings
Modified Files:
genwxbind.lua
Log Message:
Remove wxArrayString_FromLuaTable and wxArrayInt_FromLuaTable binding tag since we
convert from wxArrayInt/String automatically
Fix listctrl sorting
Fix validator code using wxLuaObject
Rename wxLuaState::LuaCall to LuaPCall since that what it calls
Lots more cleanup and shuffling of code to more appropriate places
Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** genwxbind.lua 8 Jun 2007 01:36:21 -0000 1.116
--- genwxbind.lua 11 Jun 2007 03:57:57 -0000 1.117
***************
*** 3077,3091 ****
end
! -- our special notation to get wxStringArray from a lua table of strings
! if argType == "wxArrayString_FromLuaTable" then
! overload_argList = overload_argList.."&s_wxluaarg_LuaTable, "
argItem = "wxArrayString(); wxlState.GetwxArrayString("..argNum..", "..argName..")"
declare = "wxArrayString "
! elseif argType == "wxArrayInt_FromLuaTable" then
! overload_argList = overload_argList.."&s_wxluaarg_LuaTable, "
argItem = "wxArrayInt(); wxlState.GetwxArrayInt("..argNum..", "..argName..")"
declare = "wxArrayInt "
elseif argType == "IntArray_FromLuaTable" then
! overload_argList = overload_argList.."&s_wxluaarg_LuaTable, "
argItem = "NULL; ptr = "..argName.." = wxlState.GetIntArray("..argNum..", count_)"
declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*"
--- 3077,3097 ----
end
! -- our special notation to get wxString/IntArray from a lua table of strings
! -- BUT! it has to be const wxArrayString& arr or wxArrayString arr
! -- and NOT wxArrayString& arr or wxArrayString* arr
! if ((argType == "wxArrayString") and
! ((indirectionCount == 0) or
! ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then
! overload_argList = overload_argList.."&s_wxluatag_wxArrayString, "
argItem = "wxArrayString(); wxlState.GetwxArrayString("..argNum..", "..argName..")"
declare = "wxArrayString "
! elseif ((argType == "wxArrayInt") and
! ((indirectionCount == 0) or
! ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then
! overload_argList = overload_argList.."&s_wxluatag_wxArrayInt, "
argItem = "wxArrayInt(); wxlState.GetwxArrayInt("..argNum..", "..argName..")"
declare = "wxArrayInt "
elseif argType == "IntArray_FromLuaTable" then
! overload_argList = overload_argList.."&s_wxluatag_wxArrayString, "
argItem = "NULL; ptr = "..argName.." = wxlState.GetIntArray("..argNum..", count_)"
declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*"
|
