[Wxlua-commit] wxLua/bindings genwxbind.lua,1.182,1.183

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

Update of /cvsroot/wxlua/wxLua/bindings
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24793/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
Move wx/wxprec.h before __BORLANDC__ pragma hdrstop as it should be in cpp binding files.
Move hook_cpp_binding_includes in genwxbind.lua to be written before any other code.
Comment cleanup in some headers.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.182
retrieving revision 1.183
diff -C2 -d -r1.182 -r1.183
*** genwxbind.lua	25 Sep 2009 18:47:57 -0000	1.182
--- genwxbind.lua	27 Sep 2009 03:13:51 -0000	1.183
***************
*** 584,588 ****
  -- ---------------------------------------------------------------------------
  function FileDataIsStringData(filename, strData)
!     local file_handle = io.open(filename, "rb")
      if not file_handle then return false end -- ok if it doesn't exist
  
--- 584,588 ----
  -- ---------------------------------------------------------------------------
  function FileDataIsStringData(filename, strData)
!     local file_handle = io.open(filename, "rt")
      if not file_handle then return false end -- ok if it doesn't exist
  
***************
*** 4098,4102 ****
  
  
-                 local a = {parseObject.Name}
                  local base_diff_table = {}
                  local base_type_table = {}
--- 4098,4101 ----
***************
*** 4114,4119 ****
                              end
  
-                             a[#a+1] = dataTypeTable[name].BaseClasses[i]
- 
                              -- only store the ptr_diffs to higher base classes, the 1st level is always 0
                              if level > 1 then
--- 4113,4116 ----
***************
*** 4134,4138 ****
                      baseclassVtableOffsets_name = "wxluabaseclass_vtable_offsets_"..MakeClassVar(parseObject.Name)
                      baseclassTypes_name         = "wxluabaseclass_wxluatypes_"..MakeClassVar(parseObject.Name)
-                     print(table.concat(a, " "))
                  end
  
--- 4131,4134 ----
***************
*** 4472,4487 ****
  
      if add_includes then
          table.insert(fileData, "#ifdef __BORLANDC__\n")
          table.insert(fileData, "    #pragma hdrstop\n")
          table.insert(fileData, "#endif\n")
          table.insert(fileData, "\n")
-         table.insert(fileData, "#include \"wx/wxprec.h\"\n")
-         table.insert(fileData, "\n")
          table.insert(fileData, "#ifndef WX_PRECOMP\n")
          table.insert(fileData, "     #include \"wx/wx.h\"\n")
          table.insert(fileData, "#endif\n")
          table.insert(fileData, "\n")
-         table.insert(fileData, hook_cpp_binding_includes or "")
-         table.insert(fileData, "\n")
          table.insert(fileData, "#include \"wxlua/include/wxlstate.h\"\n")
          table.insert(fileData, "#include \""..hook_cpp_header_filename.."\"\n")
--- 4468,4483 ----
  
      if add_includes then
+         table.insert(fileData, hook_cpp_binding_includes or "")
+         table.insert(fileData, "\n")
+         table.insert(fileData, "#include \"wx/wxprec.h\"\n")
+         table.insert(fileData, "\n")
          table.insert(fileData, "#ifdef __BORLANDC__\n")
          table.insert(fileData, "    #pragma hdrstop\n")
          table.insert(fileData, "#endif\n")
          table.insert(fileData, "\n")
          table.insert(fileData, "#ifndef WX_PRECOMP\n")
          table.insert(fileData, "     #include \"wx/wx.h\"\n")
          table.insert(fileData, "#endif\n")
          table.insert(fileData, "\n")
          table.insert(fileData, "#include \"wxlua/include/wxlstate.h\"\n")
          table.insert(fileData, "#include \""..hook_cpp_header_filename.."\"\n")