[Wxlua-commit] wxLua/bindings genidocs_rules.lua, 1.2, 1.3 genwxbind.lua, 1.130, 1.131

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

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

Modified Files:
	genidocs_rules.lua genwxbind.lua 
Log Message:
Add samples for picker and other controls
Fix some binding problems found from the samples


Index: genidocs_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs_rules.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** genidocs_rules.lua	18 Jun 2007 02:56:22 -0000	1.2
--- genidocs_rules.lua	19 Jun 2007 22:26:45 -0000	1.3
***************
*** 42,45 ****
--- 42,46 ----
              "mdi.i",
              "menutool.i",
+             "picker.i",
              "print.i",
              "regex.i",

Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** genwxbind.lua	19 Jun 2007 13:58:15 -0000	1.130
--- genwxbind.lua	19 Jun 2007 22:26:45 -0000	1.131
***************
*** 556,559 ****
--- 556,560 ----
      if preprocConditionTable[condition] then
          result = preprocConditionTable[condition]
+ 
      elseif string.find(condition, "%wxchkver_", 1, 1) then
          -- check for conditions like %wxchkver_1_2_3 = wxCHECK_VERSION(1,2,3)
***************
*** 566,571 ****
          result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3])
          preprocConditionTable[condition] = result -- cache result
!     elseif string.find(condition, "%wxchkver2", 1, 1) then
!         assert(false, "ERROR: %wxchkverXYZ has been replaced by %wxchkver_X_Y_Z, please update your bindings.")
      elseif string.find(condition, "%wxcompat_", 1, 1) then
          -- check for conditions like %wxcompat_1_2 = WXWIN_COMPATIBILITY_1_2
--- 567,573 ----
          result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3])
          preprocConditionTable[condition] = result -- cache result
!     elseif string.find(condition, "wxchkver_", 1, 1) then
!         print("Warning found wxchkver_XXX, did you forget the leading '%'? '"..condition.."'")
! 
      elseif string.find(condition, "%wxcompat_", 1, 1) then
          -- check for conditions like %wxcompat_1_2 = WXWIN_COMPATIBILITY_1_2
***************
*** 575,584 ****
          result = "(defined("..result..") && "..result..")"
          preprocConditionTable[condition] = result -- cache result
!     elseif string.find(condition, "%wxcompat2", 1, 1) then
!         assert(false, "ERROR: %wxcompatXY has been replaced by %wxcompat_X_Y, please update your bindings.")
      elseif string.find(condition, "wxLUA_USE_", 1, 1) then
          print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'")
      elseif string.find(condition, "wxUSE_", 1, 1) then
          print("Warning unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'")
      end
  
--- 577,592 ----
          result = "(defined("..result..") && "..result..")"
          preprocConditionTable[condition] = result -- cache result
!     elseif string.find(condition, "wxcompat_", 1, 1) then
!         print("Warning found wxcompat_XXX, did you forget the leading '%'? '"..condition.."'")
! 
      elseif string.find(condition, "wxLUA_USE_", 1, 1) then
          print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'")
      elseif string.find(condition, "wxUSE_", 1, 1) then
          print("Warning unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'")
+ 
+     elseif string.find(condition, "%wxchkver2", 1, 1) then
+         assert(false, "ERROR: %wxchkverXYZ has been replaced by %wxchkver_X_Y_Z, please update your bindings.")
+     elseif string.find(condition, "%wxcompat2", 1, 1) then
+         assert(false, "ERROR: %wxcompatXY has been replaced by %wxcompat_X_Y, please update your bindings.")
      end