[Wxlua-commit] wxLua/bindings genwxbind.lua,1.177,1.178

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Fix last commit to really use the wxlua_getenumtype() and wxlua_getuintegertype() functions.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -d -r1.177 -r1.178
*** genwxbind.lua	24 Mar 2009 04:15:04 -0000	1.177
--- genwxbind.lua	31 Mar 2009 04:23:42 -0000	1.178
***************
*** 18,22 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 25 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
--- 18,22 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 26 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
***************
*** 499,503 ****
  -- ---------------------------------------------------------------------------
  function IsDataTypeNumeric(datatype)
!     local dtype = GetDataTypedefBase(datatype)
      if dtype then
          return dtype.IsNumber
--- 499,503 ----
  -- ---------------------------------------------------------------------------
  function IsDataTypeNumeric(datatype)
!     local dtype = GetDataTypedefBase(string.gsub(datatype, "const ", ""))
      if dtype then
          return dtype.IsNumber
***************
*** 513,517 ****
  -- ---------------------------------------------------------------------------
  function IsDataTypeUInt(datatype)
!     local dtype = GetDataTypedefBase(datatype)
      if dtype then
          return dataTypeUIntTable[dtype.Name] or false
--- 513,517 ----
  -- ---------------------------------------------------------------------------
  function IsDataTypeUInt(datatype)
!     local dtype = GetDataTypedefBase(string.gsub(datatype, "const ", ""))
      if dtype then
          return dataTypeUIntTable[dtype.Name] or false
***************
*** 527,531 ****
  -- ---------------------------------------------------------------------------
  function IsDataTypeEnum(datatype)
!     local dtype = GetDataTypedefBase(datatype)
      if dtype then
          return (dtype.ValueType == "enum")
--- 527,531 ----
  -- ---------------------------------------------------------------------------
  function IsDataTypeEnum(datatype)
!     local dtype = GetDataTypedefBase(string.gsub(datatype, "const ", ""))
      if dtype then
          return (dtype.ValueType == "enum")
***************
*** 541,545 ****
  -- ---------------------------------------------------------------------------
  function IsDataTypeBool(datatype)
!     local dtype = GetDataTypedefBase(datatype)
      if dtype then
          return dataTypeBoolTable[dtype.Name] or false
--- 541,545 ----
  -- ---------------------------------------------------------------------------
  function IsDataTypeBool(datatype)
!     local dtype = GetDataTypedefBase(string.gsub(datatype, "const ", ""))
      if dtype then
          return dataTypeBoolTable[dtype.Name] or false
***************
*** 3535,3547 ****
                                  end
                              end
!                         elseif IsDataTypeBool(argType) then
                              overload_argList = overload_argList.."&wxluatype_TBOOLEAN, "
                              argItem = "wxlua_getbooleantype(L, "..argNum..")"
!                         elseif IsDataTypeEnum(argType) then
                              overload_argList = overload_argList.."&wxluatype_TINTEGER, "
!                             argItem = "("..argType..")wxlua_getenumtype(L, "..argNum..")"
!                         elseif IsDataTypeUInt(argType) then
                              overload_argList = overload_argList.."&wxluatype_TINTEGER, "
!                             argItem = "("..argType..")wxlua_getuintegertype(L, "..argNum..")"
                          elseif not numeric then
                              overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(argType)..", "
--- 3535,3547 ----
                                  end
                              end
!                         elseif IsDataTypeBool(argTypeWithAttrib) then
                              overload_argList = overload_argList.."&wxluatype_TBOOLEAN, "
                              argItem = "wxlua_getbooleantype(L, "..argNum..")"
!                         elseif IsDataTypeEnum(argTypeWithAttrib) then
                              overload_argList = overload_argList.."&wxluatype_TINTEGER, "
!                             argItem = "("..argTypeWithAttrib..")wxlua_getenumtype(L, "..argNum..")"
!                         elseif IsDataTypeUInt(argTypeWithAttrib) then
                              overload_argList = overload_argList.."&wxluatype_TINTEGER, "
!                             argItem = "("..argTypeWithAttrib..")wxlua_getuintegertype(L, "..argNum..")"
                          elseif not numeric then
                              overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(argType)..", "
***************
*** 3549,3553 ****
                          else
                              overload_argList = overload_argList.."&wxluatype_TNUMBER, "
!                             argItem = "("..argType..")wxlua_getnumbertype(L, "..argNum..")"
                          end
                      else
--- 3549,3553 ----
                          else
                              overload_argList = overload_argList.."&wxluatype_TNUMBER, "
!                             argItem = "("..argTypeWithAttrib..")wxlua_getnumbertype(L, "..argNum..")"
                          end
                      else