[Wxlua-commit] wxLua/bindings genwxbind.lua,1.71,1.72

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26676/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
make using C++ namespaces ns::MyClass work for binding generator


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** genwxbind.lua	8 Jun 2006 03:22:06 -0000	1.71
--- genwxbind.lua	9 Jun 2006 03:24:49 -0000	1.72
***************
*** 2616,2621 ****
              encapsulationBinding =
              {
!                 Declaration="wxLUA_DECLARE_ENCAPSULATION("..output_cpp_impexpsymbol..", "..parseObject.Name..")\n",
!                 Implementation="wxLUA_IMPLEMENT_ENCAPSULATION("..parseObject.Name..")\n",
                  Condition=encapcondition
              }
--- 2616,2621 ----
              encapsulationBinding =
              {
!                 Declaration="wxLUA_DECLARE_ENCAPSULATION("..output_cpp_impexpsymbol..", "..parseObject.Name..", "..MakeVar(parseObject.Name)..")\n",
!                 Implementation="wxLUA_IMPLEMENT_ENCAPSULATION("..parseObject.Name..", "..MakeVar(parseObject.Name)..")\n",
                  Condition=encapcondition
              }
***************
*** 2673,2677 ****
                      local propertyBinding =
                      {
!                         Map = "    { LuaGetProp, \""..member.Name.."\", wxLua_"..parseObject.Name.."_Get"..member.Name..", 0, 0, {0} },\n",
                          Condition = propertycondition
                      }
--- 2673,2677 ----
                      local propertyBinding =
                      {
!                         Map = "    { LuaGetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Get"..member.Name..", 0, 0, {0} },\n",
                          Condition = propertycondition
                      }
***************
*** 2687,2691 ****
                      local propertyBinding =
                      {
!                         Map = "    { LuaSetProp, \""..member.Name.."\", wxLua_"..parseObject.Name.."_Set"..member.Name..", 1, 1, {0} },\n",
                          Condition = propertycondition
                      }
--- 2687,2691 ----
                      local propertyBinding =
                      {
!                         Map = "    { LuaSetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Set"..member.Name..", 1, 1, {0} },\n",
                          Condition = propertycondition
                      }
***************
*** 3352,3356 ****
  
                      funcType = "LuaConstructor"
!                     funcLuaCall = MakeVar(parseObject.Name)
                  elseif member.Name == "~"..parseObject.Name then
                      funcName = "wxLua_"..MakeVar(parseObject.Name).."_destructor"
--- 3352,3356 ----
  
                      funcType = "LuaConstructor"
!                     funcLuaCall = MakeVar(member.AltName)
                  elseif member.Name == "~"..parseObject.Name then
                      funcName = "wxLua_"..MakeVar(parseObject.Name).."_destructor"
***************
*** 3358,3364 ****
                      funcLuaCall = MakeVar(parseObject.Name)
                  elseif member.IsConstructor then
!                     funcName = "wxLua_"..member.AltName.."_constructor"
                      funcType = "LuaConstructor"
!                     funcLuaCall = MakeVar(member.Name)
                  elseif member.IsStaticFunction then
                      -- static functions have two parts one as a member and one as a function
--- 3358,3364 ----
                      funcLuaCall = MakeVar(parseObject.Name)
                  elseif member.IsConstructor then
!                     funcName = "wxLua_"..MakeVar(member.AltName).."_constructor"
                      funcType = "LuaConstructor"
!                     funcLuaCall = MakeVar(member.AltName)
                  elseif member.IsStaticFunction then
                      -- static functions have two parts one as a member and one as a function