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

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

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

Modified Files:
	genwxbind.lua 
Log Message:
move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings
fix using more than two bindings with same namespace


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** genwxbind.lua	20 May 2006 19:40:17 -0000	1.66
--- genwxbind.lua	24 May 2006 04:50:00 -0000	1.67
***************
*** 66,71 ****
      assert(type(output_cpp_impexpsymbol) == "string", "output_cpp_impexpsymbol is not a string")
      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")
--- 66,71 ----
      assert(type(output_cpp_impexpsymbol) == "string", "output_cpp_impexpsymbol is not a string")
      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")
***************
*** 892,896 ****
      conditions["wxLUA_USE_wxListBox"]            = "wxLUA_USE_wxListBox"
      conditions["wxLUA_USE_wxListCtrl"]           = "wxLUA_USE_wxListCtrl"
-     conditions["wxLUA_USE_wxLuaDebugServer"]     = "wxLUA_USE_wxLuaDebugServer"
      conditions["wxLUA_USE_wxLuaHtmlWindow"]      = "wxLUA_USE_wxLuaHtmlWindow"
      conditions["wxLUA_USE_wxLuaPrintout"]        = "wxLUA_USE_wxLuaPrintout"
--- 892,895 ----
***************
*** 928,932 ****
      conditions["wxLUA_USE_wxStatusBar"]          = "wxLUA_USE_wxStatusBar"
      conditions["wxLUA_USE_wxStringList"]         = "wxLUA_USE_wxStringList"
-     conditions["wxLUA_USE_wxStyledTextCtrl"]     = "wxLUA_USE_wxStyledTextCtrl"
      conditions["wxLUA_USE_wxSystemSettings"]     = "wxLUA_USE_wxSystemSettings"
      conditions["wxLUA_USE_wxTabCtrl"]            = "wxLUA_USE_wxTabCtrl"
--- 927,930 ----
***************
*** 4042,4045 ****
--- 4040,4075 ----
      fileData = fileData or {}
  
+     table.insert(fileData, "\n\n")
+ 
+     -- ------------------------------------------------------------------------
+     -- GetClassList
+     -- ------------------------------------------------------------------------
+     table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
+     table.insert(fileData, "    static WXLUACLASS classList[] =\n    {\n")
+ 
+     for condition, classBindingList in pairs_sort(classBindingTable) do
+         if condition ~= nil and condition ~= "n" and condition ~= "" and classBindingList then
+             if condition ~= "1" then
+                 table.insert(fileData, "\n#if "..condition.."\n")
+             end
+ 
+             for idx, classBinding in pairs_sort(classBindingList) do
+                 table.insert(fileData, "    "..classBinding.Map)
+             end
+ 
+             if condition ~= "1" then
+                 table.insert(fileData, "#endif\n\n")
+             end
+         end
+     end
+ 
+     table.insert(fileData, "        { 0, 0, 0, 0, 0, 0, 0 }, \n")
+     table.insert(fileData, "    };\n")
+     table.insert(fileData, "    count = (sizeof(classList)/sizeof(classList[0])) - 1;\n\n")
+     table.insert(fileData, "    return classList;\n")
+     table.insert(fileData, "}\n")
+ 
+     table.insert(fileData, "\n\n")
+ 
      table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
***************
*** 4154,4186 ****
      end
  
!     table.insert(fileData, "\n\n")
! 
!     -- ------------------------------------------------------------------------
!     -- GetClassList
!     -- ------------------------------------------------------------------------
!     table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
!     table.insert(fileData, "    static WXLUACLASS classList[] =\n    {\n")
! 
!     for condition, classBindingList in pairs_sort(classBindingTable) do
!         if condition ~= nil and condition ~= "n" and condition ~= "" and classBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
!             end
! 
!             for idx, classBinding in pairs_sort(classBindingList) do
!                 table.insert(fileData, "    "..classBinding.Map)
!             end
! 
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
!             end
!         end
!     end
! 
!     table.insert(fileData, "        { 0, 0, 0, 0, 0, 0, 0 }, \n")
!     table.insert(fileData, "    };\n")
!     table.insert(fileData, "    count = (sizeof(classList)/sizeof(classList[0])) - 1;\n\n")
!     table.insert(fileData, "    return classList;\n")
!     table.insert(fileData, "}\n")
  
      return fileData
--- 4184,4188 ----
      end
  
!     table.insert(fileData, "\n")
  
      return fileData