[Wxlua-commit] wxLua/bindings genwxbind.lua,1.164,1.165

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Only include wx/wxprec.h once since it doesn't have a header guard.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** genwxbind.lua	29 Jan 2008 01:38:55 -0000	1.164
--- genwxbind.lua	29 Jan 2008 04:22:51 -0000	1.165
***************
*** 1475,1483 ****
          -- create c/c++ file
          local fileData = {}
          if output_single_cpp_binding_file then
              fileData = monolithicFileData
          end
  
!         fileData = GenerateBindingFileTable(interface, fileData)
  
          if output_single_cpp_binding_file then
--- 1475,1485 ----
          -- create c/c++ file
          local fileData = {}
+         local add_includes = true
          if output_single_cpp_binding_file then
              fileData = monolithicFileData
+             add_includes = (i == 1)
          end
  
!         fileData = GenerateBindingFileTable(interface, fileData, add_includes)
  
          if output_single_cpp_binding_file then
***************
*** 1502,1506 ****
      end
  
!     fileData = GenerateHookCppFileHeader(fileData, GetCPPFileName(hook_cpp_binding_filename))
      table.insert(fileData, (hook_cpp_binding_source_includes or "").."\n")
      fileData = GenerateHookEventFileTable(fileData)
--- 1504,1508 ----
      end
  
!     fileData = GenerateHookCppFileHeader(fileData, GetCPPFileName(hook_cpp_binding_filename), not output_single_cpp_binding_file)
      table.insert(fileData, (hook_cpp_binding_source_includes or "").."\n")
      fileData = GenerateHookEventFileTable(fileData)
***************
*** 4195,4221 ****
  -- ---------------------------------------------------------------------------
  
! function GenerateHookCppFileHeader(fileData, fileName)
      table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..fileName.." was generated by genwxbind.lua \n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// Any changes made to this file will be lost when the file is regenerated.\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\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, "#include \"wx/wxprec.h\"\n")
!     table.insert(fileData, "\n")
!     table.insert(fileData, hook_cpp_binding_includes or "")
!     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")
!     table.insert(fileData, hook_cpp_binding_post_includes or "")
!     table.insert(fileData, "\n")
  
      return fileData
--- 4197,4225 ----
  -- ---------------------------------------------------------------------------
  
! function GenerateHookCppFileHeader(fileData, fileName, add_includes)
      table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..fileName.." was generated by genwxbind.lua \n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// Any changes made to this file will be lost when the file is regenerated.\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
! 
!     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")
!         table.insert(fileData, hook_cpp_binding_post_includes or "")
!         table.insert(fileData, "\n")
!     end
  
      return fileData
***************
*** 4617,4623 ****
  -- Write Hook file for an interface file
  -- ---------------------------------------------------------------------------
! function GenerateBindingFileTable(interface, fileData)
  
!     fileData = GenerateHookCppFileHeader(fileData, interface.CPPFileName)
  
      for k, v in pairs_sort(interface.includeFiles) do
--- 4621,4627 ----
  -- Write Hook file for an interface file
  -- ---------------------------------------------------------------------------
! function GenerateBindingFileTable(interface, fileData, add_includes)
  
!     fileData = GenerateHookCppFileHeader(fileData, interface.CPPFileName, add_includes)
  
      for k, v in pairs_sort(interface.includeFiles) do