[Wxlua-commit] wxLua/bindings wxluawrap.lua,1.1,1.2

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

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

Modified Files:
	wxluawrap.lua 
Log Message:
Updated to wxIDE's wrapper files


Index: wxluawrap.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluawrap.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxluawrap.lua	7 Jun 2005 04:17:38 -0000	1.1
--- wxluawrap.lua	18 Jun 2005 20:45:58 -0000	1.2
***************
*** 558,562 ****
  
  -- returns 1 if all anded skip token directives return 1
! -- (e.g %wxver24&%wxver25)
  function getSkipTokenAndValue(tokenStr)
      local item = splitLineByChar(tokenStr, "&")
--- 558,562 ----
  
  -- returns 1 if all anded skip token directives return 1
! -- (e.g %wxchkver24&%wxchkver25)
  function getSkipTokenAndValue(tokenStr)
      local item = splitLineByChar(tokenStr, "&")
***************
*** 580,584 ****
  
  -- returns 1 if an ored skip token directive returns 1
! -- (e.g %wxver24|%wxver25)
  function getSkipTokenOrValue(tokenStr)
      local item = splitLineByChar(tokenStr, "|")
--- 580,584 ----
  
  -- returns 1 if an ored skip token directive returns 1
! -- (e.g %wxchkver24|%wxchkver25)
  function getSkipTokenOrValue(tokenStr)
      local item = splitLineByChar(tokenStr, "|")
***************
*** 1105,1124 ****
      -- we always have target in case we haven't added it to list
      skipToken[1] = {token = "%"..target, value = 1 }
!     skipToken[2] = {token = "%wxver22", value = wxVer22 }
!     skipToken[3] = {token = "%wxver23", value = wxVer23 }
!     skipToken[4] = {token = "%wxver24", value = wxVer24 }
!     skipToken[5] = {token = "%wxver25", value = wxVer25 }
!     skipToken[6] = {token = "<wxver23", value = wxVer22 }
  
      if (wxVer23 == 1 or wxVer22 == 1) then
!         skipToken[7] = {token = "<wxver24", value = 1 }
      else
!         skipToken[7] = {token = "<wxver24", value = 0 }
      end
  
      if (wxVer24 == 1 or wxVer23 == 1 or wxVer22 == 1) then
!         skipToken[8] = {token = "<wxver25", value = 1 }
      else
!         skipToken[8] = {token = "<wxver25", value = 0 }
      end
  
--- 1105,1124 ----
      -- we always have target in case we haven't added it to list
      skipToken[1] = {token = "%"..target, value = 1 }
!     skipToken[2] = {token = "%wxchkver22", value = wxVer22 }
!     skipToken[3] = {token = "%wxchkver23", value = wxVer23 }
!     skipToken[4] = {token = "%wxchkver24", value = wxVer24 }
!     skipToken[5] = {token = "%wxchkver25", value = wxVer25 }
!     skipToken[6] = {token = "<wxchkver23", value = wxVer22 }
  
      if (wxVer23 == 1 or wxVer22 == 1) then
!         skipToken[7] = {token = "<wxchkver24", value = 1 }
      else
!         skipToken[7] = {token = "<wxchkver24", value = 0 }
      end
  
      if (wxVer24 == 1 or wxVer23 == 1 or wxVer22 == 1) then
!         skipToken[8] = {token = "<wxchkver25", value = 1 }
      else
!         skipToken[8] = {token = "<wxchkver25", value = 0 }
      end
  
***************
*** 1319,1323 ****
          if string.find(a, "%if", 1, 1) then
              a = trim(remove(a, "%if"))
!             if setupTable[a] ~= 1 then
                  print("Skipping %if: "..a)
  
--- 1319,1324 ----
          if string.find(a, "%if", 1, 1) then
              a = trim(remove(a, "%if"))
!             local keep, processedLine, rettoken = processSkipTokenDirectives(a)            
!             if keep ~= 1 or setupTable[a] ~= 1 then
                  print("Skipping %if: "..a)