[Wxlua-commit] wxLua/samples bindings.wx.lua,1.22,1.23

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

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

Modified Files:
	bindings.wx.lua 
Log Message:
Fix genwxbind.bat to do wxluacan bindings correctly.
Add wxGridCellCoordsArray to bindings and functions for wxGrid to get selected cells.
Cleanup bindings.wx.lua to not make you have to click to show overloaded functions, just show them inline.


Index: bindings.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** bindings.wx.lua	20 May 2008 04:21:22 -0000	1.22
--- bindings.wx.lua	13 Dec 2008 22:35:52 -0000	1.23
***************
*** 424,428 ****
      local t = {
          {"..", ["icon"] = list_images.folder},
!         ["col_labels"] = { "name", "method_type", "wxluacfuncs_n", "basemethod", "minargs", "maxargs", "argtype_names", "argtypes" },
          ["object_type"] = "wxLuaBindMethod"
      }
--- 424,428 ----
      local t = {
          {"..", ["icon"] = list_images.folder},
!         ["col_labels"] = { "name", "method_type", "function", "basemethod", "minargs", "maxargs", "argtype_names", "argtypes" },
          ["object_type"] = "wxLuaBindMethod"
      }
***************
*** 440,478 ****
          if tbl[i].class_name then class_name = tbl[i].class_name.."::" end
  
-         local item = {
-             class_name..tbl[i].name,
-             CreatewxLuaMethod_TypeString(tbl[i].method_type),
-             tbl[i].wxluacfuncs_n,
-             "",
-             "",
-             "",
-             "",
-             "",
-             ["icon"] = list_images.folder,
-             ["col_icons"] = {},
-             ["data"] = {}
-         }
- 
-         if tbl[i].classname then
-             item[1] = tbl[i].classname.."::"..item[1]
-         end
- 
-         -- This method has a basemethod and can be expanded
-         if type(tbl[i].basemethod) == "userdata" then
-             item[4] = tbl[i].basemethod.class_name
-             item.data[4] = tbl[i].basemethod
-             item.col_icons[4] = list_images.folder
-         end
- 
-         -- Add in the CFuncs
-         item.data[1] = tbl[i].wxluacfuncs
-         item.color = wx.wxBLUE
-         table.insert(t, item)
- 
          -- keys for CFunc = { "lua_cfunc", "type", "minargs", "maxargs", "argtype_names", "argtypes" }
          local cfunc_t = CreatewxLuaBindCFunc(tbl[i].wxluacfuncs)
          for j = 2, #cfunc_t do
!             local cft = {item[1].." func "..j-1, cfunc_t[j][2], "", "", cfunc_t[j][3], cfunc_t[j][4], cfunc_t[j][5], cfunc_t[j][6]}
!             if string.find(cfunc_t[j][2], "Overload", 1, 1) then cft.color = list_colors.green end
              table.insert(t, cft)
          end
--- 440,474 ----
          if tbl[i].class_name then class_name = tbl[i].class_name.."::" end
  
          -- keys for CFunc = { "lua_cfunc", "type", "minargs", "maxargs", "argtype_names", "argtypes" }
          local cfunc_t = CreatewxLuaBindCFunc(tbl[i].wxluacfuncs)
          for j = 2, #cfunc_t do
!             local cft = {
!                 class_name..tbl[i].name,
!                 cfunc_t[j][2], 
!                 tostring(cfunc_t[j][1]), 
!                 "", 
!                 cfunc_t[j][3], 
!                 cfunc_t[j][4], 
!                 cfunc_t[j][5], 
!                 cfunc_t[j][6],
!                 ["icon"] = nil,
!                 ["col_icons"] = {},
!                 ["data"] = {}
!             }
! 
!             if string.find(cfunc_t[j][2], "Overload", 1, 1) then 
!                 cft.color = list_colors.green 
!             end
!             if #cfunc_t > 2 then 
!                 cft[1] = cft[1].." "..tostring(j-1) 
!             end
! 
!             -- This method has a basemethod and can be expanded
!             if type(tbl[i].basemethod) == "userdata" then
!                 cft[4] = tbl[i].basemethod.class_name
!                 cft.data[4] = tbl[i].basemethod
!                 cft.col_icons[4] = list_images.folder
!             end
! 
              table.insert(t, cft)
          end
***************
*** 833,840 ****
          local t = nil
  
!         if (col == 0) and (type(data[data_index].data[col+1]) == "table") then
!             t = CreatewxLuaBindCFunc(data[data_index].data[col+1])
!             t.class_name = data.class_name
!         elseif (col == 3) and (type(data[data_index].data[col+1]) == "userdata") then
              t = CreatewxLuaBindMethod({data[data_index].data[col+1]})
              t.class_name = data[data_index][col+1].class_name
--- 829,833 ----
          local t = nil
  
!         if (col == 3) and (type(data[data_index].data[col+1]) == "userdata") then
              t = CreatewxLuaBindMethod({data[data_index].data[col+1]})
              t.class_name = data[data_index][col+1].class_name