[Wxlua-commit] wxLua/bindings genwxbind.lua,1.67,1.68

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

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

Modified Files:
	genwxbind.lua 
Log Message:
changed wxEvtHandler::ConnectEvent to Connect
update all samples to reflect this
add win id ranges to connect
add untested wxEvtHandler::Disconnect


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** genwxbind.lua	24 May 2006 04:50:00 -0000	1.67
--- genwxbind.lua	25 May 2006 03:55:22 -0000	1.68
***************
*** 67,71 ****
      assert(type(output_cpp_impexpdatasymbol) == "string", "output_cpp_impexpdatasymbol is not a string")
  
- 
      assert(type(hook_lua_namespace) == "string", "hook_lua_namespace is not a string")
      assert(type(hook_cpp_namespace) == "string", "hook_cpp_namespace is not a string")
--- 67,70 ----
***************
*** 1171,1177 ****
          while lineData[i+1] do
              i = i + 1
!             if lineData[i] == "/*" then
                  inComment = true
!             elseif lineData[i] == "*/" then
                  inComment = false
              elseif lineData[i] == "%override" then
--- 1170,1176 ----
          while lineData[i+1] do
              i = i + 1
!             if (not inOverride) and (lineData[i] == "/*") then
                  inComment = true
!             elseif (not inOverride) and (lineData[i] == "*/") then
                  inComment = false
              elseif lineData[i] == "%override" then
***************
*** 2548,2551 ****
--- 2547,2556 ----
  end
  
+ function MakeImpExpData(data_type)
+     if output_cpp_impexpdatasymbol and (string.len(output_cpp_impexpdatasymbol) > 0) then
+         return output_cpp_impexpdatasymbol.."("..data_type..")"
+     end
+     return data_type
+ end
  
  -- Create Language Binding
***************
*** 2966,2970 ****
                  local objectTagBinding =
                  {
!                     ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                      Condition = fullcondition
                  }
--- 2971,2975 ----
                  local objectTagBinding =
                  {
!                     ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                      Condition = fullcondition
                  }
***************
*** 3003,3007 ****
                  local objectTagBinding =
                  {
!                     ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                      Condition = fullcondition
                  }
--- 3008,3012 ----
                  local objectTagBinding =
                  {
!                     ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                      Condition = fullcondition
                  }
***************
*** 3039,3043 ****
                  local eventTagBinding =
                  {
!                     ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                      Condition = fullcondition
                  }
--- 3044,3048 ----
                  local eventTagBinding =
                  {
!                     ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                      Condition = fullcondition
                  }
***************
*** 3726,3732 ****
              local classTagBinding =
              {
!                 ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                  ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n",
!                 ExternMethodCountDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) "..MakeVar(parseObject.Name).."_methodCount;\n",
                  Condition = tagcondition
              }
--- 3731,3737 ----
              local classTagBinding =
              {
!                 ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n",
                  ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n",
!                 ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n",
                  Condition = tagcondition
              }