wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan_bind.cpp, 1.34, 1.35

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan_bind.cpp 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxluacan_bind.cpp	29 Jan 2008 04:22:51 -0000	1.34
--- wxluacan_bind.cpp	14 May 2009 05:06:21 -0000	1.35
***************
*** 641,655 ****
  // ---------------------------------------------------------------------------
  
  wxLuaBindClass* wxLuaGetClassList_wxluacan(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, "wxScrolledWindow", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, "wxCommandProcessor", NULL ,g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 
--- 641,682 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxCommandProcessor = "wxCommandProcessor";
+ static const char* wxluaclassname_wxObject = "wxObject";
+ static const char* wxluaclassname_wxScrolledWindow = "wxScrolledWindow";
+ static const char* wxluaclassname_wxlCan = "wxlCan";
+ static const char* wxluaclassname_wxlCanObj = "wxlCanObj";
+ static const char* wxluaclassname_wxlCanObjAddScript = "wxlCanObjAddScript";
+ static const char* wxluaclassname_wxlCanObjCircle = "wxlCanObjCircle";
+ static const char* wxluaclassname_wxlCanObjRect = "wxlCanObjRect";
+ static const char* wxluaclassname_wxlCanObjScript = "wxlCanObjScript";
+ static const char* wxluaclassname_wxlLuaCanCmd = "wxlLuaCanCmd";
+ 
+ static const char* wxluabaseclassnames_wxlCan[] = { wxluaclassname_wxScrolledWindow, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCan[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObj[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObj[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjAddScript[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjAddScript[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjCircle[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjCircle[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjRect[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjRect[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjScript[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjScript[] = { NULL };
+ static const char* wxluabaseclassnames_wxlLuaCanCmd[] = { wxluaclassname_wxCommandProcessor, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlLuaCanCmd[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxluacan(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { wxluaclassname_wxlCan, wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, wxluabaseclassnames_wxlCan, wxluabaseclassbinds_wxlCan, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObj, wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, wxluabaseclassnames_wxlCanObj, wxluabaseclassbinds_wxlCanObj, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjAddScript, wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, wxluabaseclassnames_wxlCanObjAddScript, wxluabaseclassbinds_wxlCanObjAddScript, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjCircle, wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, wxluabaseclassnames_wxlCanObjCircle, wxluabaseclassbinds_wxlCanObjCircle, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjRect, wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, wxluabaseclassnames_wxlCanObjRect, wxluabaseclassbinds_wxlCanObjRect, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjScript, wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, wxluabaseclassnames_wxlCanObjScript, wxluabaseclassbinds_wxlCanObjScript, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlLuaCanCmd, wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, wxluabaseclassnames_wxlLuaCanCmd, wxluabaseclassbinds_wxlLuaCanCmd, g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 

[Wxlua-commit] wxLua/samples bindings.wx.lua, 1.23, 1.24 scribble.wx.lua, 1.26, 1.27 wxluasudoku.wx.lua, 1.77, 1.78

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

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

Modified Files:
	bindings.wx.lua scribble.wx.lua wxluasudoku.wx.lua 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxluasudoku.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** wxluasudoku.wx.lua	22 Jan 2008 04:45:39 -0000	1.77
--- wxluasudoku.wx.lua	14 May 2009 05:06:22 -0000	1.78
***************
*** 1303,1318 ****
  
              --for k, v in pairs(possible) do -- use for loop to ensure direction
!             for n = 1, 9 do
!                 local k = n
!                 if backwards == true then k = 10 - n end
!                 if possible[k] then
                      -- try a number and remove it as a possibility
!                     sudoku.RemoveCellPossible(s, cell, k)
  
                      -- start a new table and test out this guess
                      local s1 = TableCopy(s)
                      -- don't use SetValue since we only care about possible
!                     s1.values[cell] = k --sudoku.SetValue(s1, row, col, k)
!                     sudoku.RemovePossibleAll(s1, cell, k, nil, true)
  
                      guesses[cell]   = guesses[cell] + 1
--- 1303,1321 ----
  
              --for k, v in pairs(possible) do -- use for loop to ensure direction
!             
!             local start_n = iff(backwards, 9,  1)
!             local end_n   = iff(backwards, 1,  9)
!             local dir_n   = iff(backwards, -1, 1)
!             
!             for n = start_n, end_n, dir_n do
!                 if possible[n] then
                      -- try a number and remove it as a possibility
!                     sudoku.RemoveCellPossible(s, cell, n)
  
                      -- start a new table and test out this guess
                      local s1 = TableCopy(s)
                      -- don't use SetValue since we only care about possible
!                     s1.values[cell] = n --sudoku.SetValue(s1, row, col, n)
!                     sudoku.RemovePossibleAll(s1, cell, n, nil, true)
  
                      guesses[cell]   = guesses[cell] + 1
***************
*** 1466,1470 ****
  
          -- restart this function if we run out of cells to try
!         if cell_count + i < num_cells_to_keep then
              trial = trial + 1
              i = 0
--- 1469,1473 ----
  
          -- restart this function if we run out of cells to try
!         if (cell_count == 0) or (cell_count + i < num_cells_to_keep) then
              trial = trial + 1
              i = 0

Index: scribble.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** scribble.wx.lua	21 Feb 2009 02:05:01 -0000	1.26
--- scribble.wx.lua	14 May 2009 05:06:21 -0000	1.27
***************
*** 28,35 ****
  fileName       = ""    -- filename to save to
  ID_SAVEBITMAP  = wx.wxID_HIGHEST + 1
! ID_PENCOLOUR   = wx.wxID_HIGHEST + 2
! ID_PENWIDTH    = wx.wxID_HIGHEST + 3
! ID_PENSTYLE    = wx.wxID_HIGHEST + 4
! ID_PENWIDTH_SPINCTRL = wx.wxID_HIGHEST + 5
  
  currentPen     = wx.wxPen(wx.wxRED_PEN); currentPen:SetWidth(3)
--- 28,36 ----
  fileName       = ""    -- filename to save to
  ID_SAVEBITMAP  = wx.wxID_HIGHEST + 1
! ID_IMAGESIZE   = wx.wxID_HIGHEST + 2
! ID_PENCOLOUR   = wx.wxID_HIGHEST + 3
! ID_PENWIDTH    = wx.wxID_HIGHEST + 4
! ID_PENSTYLE    = wx.wxID_HIGHEST + 5
! ID_PENWIDTH_SPINCTRL = wx.wxID_HIGHEST + 6
  
  currentPen     = wx.wxPen(wx.wxRED_PEN); currentPen:SetWidth(3)
***************
*** 303,306 ****
--- 304,338 ----
  end
  
+ function SetBitmapSize()
+     local w, h = bitmap:GetWidth(), bitmap:GetHeight()
+ 
+     local ok = true
+     repeat
+         local s = wx.wxGetTextFromUser("Enter the image size to use as 'width height'", "Set new image size",
+                                         string.format("%d %d", bitmap:GetWidth(), bitmap:GetHeight()), frame)
+         if (#s == 0) then
+             return false -- they canceled the dialog
+         end
+         w, h = string.match(s, "(%d+) (%d+)")
+ 
+         w = tonumber(w)
+         h = tonumber(h)
+         if (w == nil) or (h == nil) or (w < 2) or (h < 2) or (w > 10000) or (h > 10000) then
+             wx.wxMessageBox("Please enter two positive numbers < 10000 for the width and height separated by a space",
+                             "Invalid image width or height", wx.wxOK + wx.wxCENTRE + wx.wxICON_ERROR, frame)
+             ok = false
+         end
+     until ok
+ 
+     -- resize all the drawing objects
+     bitmap:delete()
+     bitmap = wx.wxBitmap(w, h)
+     panel:SetSize(w, h)
+     scrollwin:SetScrollbars(1, 1, w, h)
+ 
+     return true
+ end
+ 
+ 
  -- ---------------------------------------------------------------------------
  -- The main program
***************
*** 325,330 ****
  
      local editMenu = wx.wxMenu()
!     editMenu:Append(ID_PENCOLOUR, "Set pen &color\tCtrl+R", "Set the color of the pen to draw with")
!     editMenu:Append(ID_PENWIDTH,  "Set pen &width\tCtrl+T", "Set width of the pen to draw with")
      -- Pen styles really only work for long lines, when you change direction the styles
      --   blur into each other and just look like a solid line.
--- 357,363 ----
  
      local editMenu = wx.wxMenu()
!     editMenu:Append(ID_IMAGESIZE, "Set image size...", "Set the size of the image to draw on")
!     editMenu:Append(ID_PENCOLOUR, "Set pen &color...\tCtrl+R", "Set the color of the pen to draw with")
!     editMenu:Append(ID_PENWIDTH,  "Set pen &width...\tCtrl+T", "Set width of the pen to draw with")
      -- Pen styles really only work for long lines, when you change direction the styles
      --   blur into each other and just look like a solid line.
***************
*** 489,525 ****
                  end
  
!                 local w, h = bitmap:GetWidth(), bitmap:GetHeight()
! 
!                 local ok = true
!                 repeat
!                     local s = wx.wxGetTextFromUser("Enter the image size to use as 'width height'", "Set new image size",
!                                                    string.format("%d %d", bitmap:GetWidth(), bitmap:GetHeight()), frame)
!                     if (#s == 0) then
!                         return -- they canceled the dialog
!                     end
!                     w, h = string.match(s, "(%d+) (%d+)")
! 
!                     w = tonumber(w)
!                     h = tonumber(h)
!                     if (w == nil) or (h == nil) or (w < 2) or (h < 2) or (w > 10000) or (h > 10000) then
!                         wx.wxMessageBox("Please enter two positive numbers for the width and height separated by a space",
!                                         "Invalid image width or height", wx.wxOK + wx.wxCENTRE + wx.wxICON_ERROR, frame)
!                         ok = false
!                     end
!                 until ok
! 
!                 -- resize all the drawing objects
!                 bitmap:delete()
!                 bitmap = wx.wxBitmap(w, h)
!                 panel:SetSize(w, h)
!                 scrollwin:SetScrollbars(1, 1, w, h)
  
!                 fileName = ""
!                 frame:SetTitle("wxLua Scribble")
!                 pointsList = {}
!                 lastDrawn = 0
!                 redrawRequired = true
!                 isModified = false
!                 panel:Refresh()
              end )
  
--- 522,536 ----
                  end
  
!                 local bmp_changed = SetBitmapSize()
  
!                 if bmp_changed then
!                     fileName = ""
!                     frame:SetTitle("wxLua Scribble")
!                     pointsList = {}
!                     lastDrawn = 0
!                     redrawRequired = true
!                     isModified = false
!                     panel:Refresh()
!                 end
              end )
  
***************
*** 590,593 ****
--- 601,612 ----
      -- Edit menu events
  
+     frame:Connect(ID_IMAGESIZE, wx.wxEVT_COMMAND_MENU_SELECTED,
+             function (event)
+                 local bmp_changed = SetBitmapSize()
+                 lastDrawn = 0
+                 redrawRequired = true
+                 panel:Refresh()
+             end )
+ 
      frame:Connect(ID_PENCOLOUR, wx.wxEVT_COMMAND_MENU_SELECTED,
              function (event)

Index: bindings.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** bindings.wx.lua	13 Dec 2008 22:35:52 -0000	1.23
--- bindings.wx.lua	14 May 2009 05:06:21 -0000	1.24
***************
*** 72,76 ****
      if true then
          print("\nDUMPING binding.GetClassArray ==================================\n")
!         local keys = { "name", "wxluamethods", "wxluamethods_n", "classInfo", "wxluatype", "baseclassName", "baseclass", "enums", "enums_n" }
          ColumnDumpTable(binding.GetClassArray, keys)
      end
--- 72,76 ----
      if true then
          print("\nDUMPING binding.GetClassArray ==================================\n")
!         local keys = { "name", "wxluamethods", "wxluamethods_n", "classInfo", "wxluatype", "baseclassNames", "baseBindClasses", "enums", "enums_n" }
          ColumnDumpTable(binding.GetClassArray, keys)
      end
***************
*** 339,348 ****
      local t = {
          {"..", ["icon"] = list_images.folder},
!         ["col_labels"] = { "Class Name", "# Methods", "wxClassInfo", "Class Tag", "Base Class Name", "# Enums" },
          ["object_type"] = "wxLuaBindClass"
      }
  
      -- items in table from binding.GetClassArray are these
!     -- { "name", "wxluamethods", "wxluamethods_n", "classInfo", "wxluatype", "baseclassName", "baseclass", "enums", "enums_n" }
  
      local function GetClassInfoStr(classInfo)
--- 339,348 ----
      local t = {
          {"..", ["icon"] = list_images.folder},
!         ["col_labels"] = { "Class Name", "# Methods", "wxClassInfo", "Class Tag", "Base Class Names", "# Enums" },
          ["object_type"] = "wxLuaBindClass"
      }
  
      -- items in table from binding.GetClassArray are these
!     -- { "name", "wxluamethods", "wxluamethods_n", "classInfo", "wxluatype", "baseclassNames", "baseBindClasses", "enums", "enums_n" }
  
      local function GetClassInfoStr(classInfo)
***************
*** 370,374 ****
      t.col_numbers[6] = true
  
!     --{ "name"[data], "wxluamethods_n", "classInfo", "wxluatype", "baseclassName"[data], "enums_n"[data] }
      for i = 1, #tbl do
          local item = {
--- 370,374 ----
      t.col_numbers[6] = true
  
!     --{ "name"[data], "wxluamethods_n", "classInfo", "wxluatype", "baseclassNames"[data], "enums_n"[data] }
      for i = 1, #tbl do
          local item = {
***************
*** 377,381 ****
              GetClassInfoStr(tbl[i].classInfo),
              tbl[i].wxluatype,
!             tbl[i].baseclassName or "",
              tbl[i].enums_n,
              ["col_icons"] = {},
--- 377,381 ----
              GetClassInfoStr(tbl[i].classInfo),
              tbl[i].wxluatype,
!             table.concat(tbl[i].baseclassNames or {}, ","),
              tbl[i].enums_n,
              ["col_icons"] = {},
***************
*** 390,396 ****
  
          -- This class has a baseclass and can be expanded
!         if (type(tbl[i].baseclass) == "userdata") then
              item.col_icons[5] = list_images.folder
!             item.data[5] = tbl[i].baseclass
          end
  
--- 390,396 ----
  
          -- This class has a baseclass and can be expanded
!         if (type(tbl[i].baseBindClasses) == "table") then
              item.col_icons[5] = list_images.folder
!             item.data[5] = tbl[i].baseBindClasses
          end
  
***************
*** 405,409 ****
              print(tbl[i].name, "is missing methods table, please report this.")
          end
!         if (tbl[i].baseclassName) and (type(tbl[i].baseclass) ~= "userdata") then
              print(tbl[i].name, "is missing baseclass userdata, please report this.")
          end
--- 405,409 ----
              print(tbl[i].name, "is missing methods table, please report this.")
          end
!         if (tbl[i].baseclassNames) and (type(tbl[i].baseBindClasses) ~= "table") then
              print(tbl[i].name, "is missing baseclass userdata, please report this.")
          end
***************
*** 438,442 ****
      for i = 1, #tbl do
          local class_name = ""
!         if tbl[i].class_name then class_name = tbl[i].class_name.."::" end
  
          -- keys for CFunc = { "lua_cfunc", "type", "minargs", "maxargs", "argtype_names", "argtypes" }
--- 438,447 ----
      for i = 1, #tbl do
          local class_name = ""
!         if tbl[i].class_name then 
!             class_name = tbl[i].class_name.."::" 
!         end
!         if classname then 
!             class_name = classname.."::" 
!         end
  
          -- keys for CFunc = { "lua_cfunc", "type", "minargs", "maxargs", "argtype_names", "argtypes" }
***************
*** 510,514 ****
  -- ----------------------------------------------------------------------------
  function CreatewxLuaBindEvent(tbl)
!     local keys = { "name", "eventType", "wxluatype" }
      local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindEvent")
  
--- 515,519 ----
  -- ----------------------------------------------------------------------------
  function CreatewxLuaBindEvent(tbl)
!     local keys = { "name", "eventType", "wxluatype", "wxLuaBindClass" }
      local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindEvent")
  
***************
*** 520,523 ****
--- 525,538 ----
          t[i][3] = wxlua.typename(t[i][3]).." ("..t[i][3]..")"
          -- if t[i-1][2] == t[i][2] then t[i].color = wx.wxRED end -- see if there's dups, there's a couple, but they're right
+ 
+         -- Set the wxLuaBindClass for this event type
+         if type(t[i][4]) == "userdata" then
+             local c = t[i][4]
+             t[i][4] = c.name
+             t[i].data = {}
+             t[i].data[4] = c
+             t[i].col_icons = {}
+             t[i].col_icons[4] = list_images.folder
+         end
      end
  
***************
*** 529,533 ****
  -- ----------------------------------------------------------------------------
  function CreatewxLuaBindObject(tbl)
!     local keys = { "name", "object", "wxluatype" }
      local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindObject")
  
--- 544,548 ----
  -- ----------------------------------------------------------------------------
  function CreatewxLuaBindObject(tbl)
!     local keys = { "name", "object", "wxluatype", "wxLuaBindClass" }
      local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindObject")
  
***************
*** 535,538 ****
--- 550,563 ----
      for i = 2, #t do
          t[i][3] = wxlua.typename(t[i][3]).." ("..t[i][3]..")"
+ 
+         -- Set the wxLuaBindClass for this object
+         if type(t[i][4]) == "userdata" then
+             local c = t[i][4]
+             t[i][4] = c.name
+             t[i].data = {}
+             t[i].data[4] = c
+             t[i].col_icons = {}
+             t[i].col_icons[4] = list_images.folder
+         end
      end
  
***************
*** 793,797 ****
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and data.object_type == "wxLuaBindClass" then
          local t = nil
  
--- 818,822 ----
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and (data.object_type == "wxLuaBindClass") then
          local t = nil
  
***************
*** 800,818 ****
  
              if frame:GetMenuBar():IsChecked(ID_VIEW_BASECLASS_FUNCTIONS) then
!                 local c = data[data_index].data[5]
!                 while type(c) == "userdata" do
!                     local tt = CreatewxLuaBindMethod(c.wxluamethods, c.name)
!                     for i = 2, #tt do -- skip ".."
!                         if not (string.find(tt[i][2], "Constructor", 1, 1) or
!                                 string.find(t[i][1], "delete", 1, 1)) then
!                                 --string.find(t[i][1], "::"..c.name, 1, 1)) then
!                             table.insert(t, tt[i])
                          end
                      end
-                     c = c.baseclass
                  end
              end
!         elseif (col == 4) and (type(data[data_index].data[col+1]) == "userdata") then
!             t = CreatewxLuaBindClass({data[data_index].data[col+1]})
          elseif (col == 5) and (type(data[data_index].data[col+1]) == "table") then
              t = CreatewxLuaBindNumber(data[data_index].data[col+1])
--- 825,867 ----
  
              if frame:GetMenuBar():IsChecked(ID_VIEW_BASECLASS_FUNCTIONS) then
!                 print("hi")
!                 local ct = data[data_index].data[5]
!                 
!                 local function recurse_baseclasstable(ct, t)
!                     for i, c in ipairs(ct) do
!                         print(c.name)
!                         local tt = CreatewxLuaBindMethod(c.wxluamethods, c.name)
!                         for i = 2, #tt do -- skip ".."
!                             if not (string.find(tt[i][2], "Constructor", 1, 1) or
!                                     string.find(t[i][1], "delete", 1, 1)) then
!                                     --string.find(t[i][1], "::"..c.name, 1, 1)) then
!                                 table.insert(t, tt[i])
!                             end
!                         end
!                         
!                         if c.baseBindClasses then
!                             recurse_baseclasstable(c.baseBindClasses, t)
                          end
                      end
                  end
+                 
+                 if type(ct) == "table" then
+                     recurse_baseclasstable(ct, t)
+                 end
+                 
+                 --while type(ct) == "table" do
+                 --    local tt = CreatewxLuaBindMethod(c.wxluamethods, c.name)
+                 --    for i = 2, #tt do -- skip ".."
+                 --        if not (string.find(tt[i][2], "Constructor", 1, 1) or
+                 --                string.find(t[i][1], "delete", 1, 1)) then
+                 --                --string.find(t[i][1], "::"..c.name, 1, 1)) then
+                 --            table.insert(t, tt[i])
+                 --        end
+                 --   end
+                 --    c = c.baseclass
+                 --end
              end
!         elseif (col == 4) and (type(data[data_index].data[col+1]) == "table") then
!             t = CreatewxLuaBindClass(data[data_index].data[col+1])
          elseif (col == 5) and (type(data[data_index].data[col+1]) == "table") then
              t = CreatewxLuaBindNumber(data[data_index].data[col+1])
***************
*** 826,830 ****
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and data.object_type == "wxLuaBindMethod" then
          local t = nil
  
--- 875,879 ----
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and (data.object_type == "wxLuaBindMethod") then
          local t = nil
  
***************
*** 839,842 ****
--- 888,920 ----
              GotoBindingLevel(listCtrl, list_level)
          end
+ 
+     elseif (data_index > 1) and (data.object_type == "wxLuaBindEvent") then
+         local t = nil
+ 
+         if (col == 3) and (type(data[data_index].data[col+1]) == "userdata") then
+             t = CreatewxLuaBindClass({data[data_index].data[col+1]})       
+         end
+ 
+         if t ~= nil then
+             t.class_name = listCtrl:GetItemText(index)
+ 
+             list_level = list_level + 1
+             listData[list_level] = t
+             GotoBindingLevel(listCtrl, list_level)
+         end
+     elseif (data_index > 1) and (data.object_type == "wxLuaBindObject") then
+         local t = nil
+ 
+         if (col == 3) and (type(data[data_index].data[col+1]) == "userdata") then
+             t = CreatewxLuaBindClass({data[data_index].data[col+1]})       
+         end
+ 
+         if t ~= nil then
+             t.class_name = listCtrl:GetItemText(index)
+ 
+             list_level = list_level + 1
+             listData[list_level] = t
+             GotoBindingLevel(listCtrl, list_level)
+         end
      end
  
***************
*** 1212,1215 ****
--- 1290,1295 ----
      menuBar:Append(helpMenu, "&Help")
      frame:SetMenuBar(menuBar)
+   
+     -- -----------------------------------------------------------------------
  
      frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED,
***************
*** 1258,1261 ****
--- 1338,1372 ----
  
      -- -----------------------------------------------------------------------
+     -- Create the toolbar
+     
+     toolbar = frame:CreateToolBar()
+     
+     local bmp = wx.wxArtProvider.GetBitmap(wx.wxART_GO_HOME, wx.wxART_TOOLBAR, wx.wxDefaultSize)
+     toolbar:AddTool(wx.wxID_HOME, "Home", bmp, "Go to root level")
+     bmp:delete()
+     local bmp = wx.wxArtProvider.GetBitmap(wx.wxART_GO_BACK, wx.wxART_TOOLBAR, wx.wxDefaultSize)
+     toolbar:AddTool(wx.wxID_BACKWARD, "Back", bmp, "Go back a level")
+     bmp:delete()
+     --local bmp = wx.wxArtProvider.GetBitmap(wx.wxART_GO_FORWARD, wx.wxART_TOOLBAR, wx.wxDefaultSize)
+     --toolbar:AddTool(wx.wxID_FORWARD, "Forward", bmp, "Go forward a level")
+     --bmp:delete()
+ 
+     -- -----------------------------------------------------------------------
+ 
+     frame:Connect(wx.wxID_HOME, wx.wxEVT_COMMAND_MENU_SELECTED,
+         function (event)
+             list_level = 1
+             GotoBindingLevel(listCtrl, list_level)
+         end )
+ 
+     frame:Connect(wx.wxID_BACKWARD, wx.wxEVT_COMMAND_MENU_SELECTED,
+         function (event)
+             if list_level > 1 then
+                 list_level = list_level - 1
+                 GotoBindingLevel(listCtrl, list_level)
+             end
+         end )
+ 
+     -- -----------------------------------------------------------------------
      -- Create the status bar
      frame:CreateStatusBar(1)

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.121, 1.122 wxlstate.cpp, 1.179, 1.180 wxlua_bind.cpp, 1.30, 1.31

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/modules/wxlua/src

Modified Files:
	wxlbind.cpp wxlstate.cpp wxlua_bind.cpp 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** wxlstate.cpp	24 Mar 2009 04:15:32 -0000	1.179
--- wxlstate.cpp	14 May 2009 05:06:21 -0000	1.180
***************
*** 1191,1194 ****
--- 1191,1225 ----
  // ----------------------------------------------------------------------------
  
+ static int wxluaT_isderivedtype_recurser(const wxLuaBindClass *wxlClass, int base_wxl_type, int levels)
+ {
+     if (wxlClass != NULL)
+     {
+         if (*wxlClass->wxluatype == base_wxl_type)
+             return levels;
+         else if (wxlClass->baseclassNames != NULL) // check baseclass by baseclass
+         {
+             for (size_t i = 0; wxlClass->baseclassNames[i]; ++i)
+             {
+                 // Note: base class may be NULL if lib/module containing it is not loaded
+                 wxLuaBindClass* baseClass = wxlClass->baseBindClasses[i];
+ 
+                 if (baseClass != NULL)
+                 {
+                     if (*baseClass->wxluatype == base_wxl_type)
+                         return levels;
+                     else
+                     {
+                         int ret = wxluaT_isderivedtype_recurser(baseClass, base_wxl_type, levels+1);
+                         if (ret > -1)
+                             return ret;
+                     }
+                 }
+             }
+         }
+     }
+ 
+     return -1; // wxluatype is not derived from base_wxluatype
+ }
+ 
  int LUACALL wxluaT_isderivedtype(lua_State* L, int wxl_type, int base_wxl_type)
  {
***************
*** 1202,1217 ****
  
      const wxLuaBindClass *wxlClass = wxluaT_getclass(L, wxl_type);
-     int levels = 1;
- 
-     while (wxlClass != NULL) // check baseclass by baseclass
-     {
-         if (wxlClass->baseclass && (*wxlClass->baseclass->wxluatype == base_wxl_type))
-             return levels;
  
!         wxlClass = wxlClass->baseclass;
!         ++levels;
!     }
! 
!     return -1; // wxluatype is not derived from base_wxluatype
  }
  
--- 1233,1238 ----
  
      const wxLuaBindClass *wxlClass = wxluaT_getclass(L, wxl_type);
  
!     return wxluaT_isderivedtype_recurser(wxlClass, base_wxl_type, 1);
  }
  
***************
*** 1222,1237 ****
          return -1;
  
!     const wxLuaBindClass* c = wxlClass;
!     int levels = 0;
!     while (c != NULL)
!     {
!         if (c->wxluatype == base_wxlClass->wxluatype) // comparing pointers
!             return levels;
! 
!         c = c->baseclass;
!         ++levels;
!     }
  
!     return -1; // wxlClass is not derived from wxlBaseClass
  }
  
--- 1243,1251 ----
          return -1;
  
!     // These two types are the same
!     if (wxlClass->wxluatype == base_wxlClass->wxluatype) // comparing pointers
!         return 0;
  
!     return wxluaT_isderivedtype_recurser(wxlClass, *base_wxlClass->wxluatype, 1);
  }
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** wxlbind.cpp	8 Dec 2008 05:17:11 -0000	1.121
--- wxlbind.cpp	14 May 2009 05:06:21 -0000	1.122
***************
*** 1433,1436 ****
--- 1433,1455 ----
  
  // static
+ const wxLuaBindClass* wxLuaBinding::FindBindClass(const char* className)
+ {
+     wxLuaBindingList::compatibility_iterator node = sm_bindingList.GetFirst();
+ 
+     while (node)
+     {
+         wxLuaBinding* binding = node->GetData();
+         const wxLuaBindClass* wxlClass = binding->GetBindClass(className);
+ 
+         if (wxlClass)
+             return wxlClass;
+ 
+         node = node->GetNext();
+     }
+ 
+     return NULL;
+ }
+ 
+ // static
  const wxLuaBindClass* wxLuaBinding::FindBindClass(int wxluatype)
  {
***************
*** 1549,1554 ****
                                                         wxLuaBindMethodArrayCompareFnGet);
  
!     if ((wxlMethod == NULL) && search_baseclasses && wxlClass->baseclass)
!         return GetClassMethod(wxlClass->baseclass, methodName, method_type, search_baseclasses);
  
  #else
--- 1568,1580 ----
                                                         wxLuaBindMethodArrayCompareFnGet);
  
!     if ((wxlMethod == NULL) && search_baseclasses && wxlClass->baseclassNames)
!     {
!         for (size_t i = 0; wxlClass->baseclassNames[i]; ++i)
!         {
!             wxlMethod = GetClassMethod(wxlClass->baseBindClasses[i], methodName, method_type, search_baseclasses);
!             if (wxlMethod != NULL)
!                 return wxlMethod;
!         }
!     }
  
  #else
***************
*** 1577,1580 ****
--- 1603,1642 ----
  // --------------------------------------------------------------------------
  
+ static void wxLuaBinding_RecurseBaseMethods(wxLuaBindClass* wxlClass, wxLuaBindMethod* wxlMethod, bool force_update)
+ {
+     // iterate through the base classes to find if this function is
+     // an overload, but only if we haven't checked already.
+     if (force_update || !WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_CHECKED_OVERLOAD|WXLUAMETHOD_DELETE))
+     {
+         wxLuaBindMethod *parentMethod = wxlMethod;
+ 
+         // Use the baseclassNames to check for terminating NULL
+         for (size_t i = 0; wxlClass->baseclassNames && wxlClass->baseclassNames[i]; ++i)
+         {
+             // Note that these may be NULL if the lib/module containing them wasn't loaded
+             wxLuaBindClass *baseClass = wxlClass->baseBindClasses[i];
+             if (baseClass != NULL)
+             {
+                 parentMethod->method_type |= WXLUAMETHOD_CHECKED_OVERLOAD; // have checked parent
+ 
+                 wxLuaBindMethod* baseMethod = wxLuaBinding::GetClassMethod(baseClass, wxlMethod->name, WXLUAMETHOD_SEARCH_MASK, false);
+                 if (baseMethod)
+                 {
+                     // don't link to base class delete functions
+                     if (!WXLUA_HASBIT(baseMethod->method_type, WXLUAMETHOD_DELETE))
+                     {
+                         parentMethod->basemethod = baseMethod;
+                         parentMethod = baseMethod;
+                     }
+ 
+                     // we have already checked the base classes below this
+                     if (!WXLUA_HASBIT(baseMethod->method_type, WXLUAMETHOD_CHECKED_OVERLOAD))
+                         wxLuaBinding_RecurseBaseMethods(baseClass, parentMethod, force_update);
+                 }
+             }
+         }
+     }
+ }
+ 
  // static
  void wxLuaBinding::InitAllBindings(bool force_update)
***************
*** 1592,1596 ****
      }
  
!     // setup base class wxLua types
      node = sm_bindingList.GetFirst();
      while (node)
--- 1654,1658 ----
      }
  
!     // set the base class wxLuaBindClass* using the base class names of the parent wxLuaBindClass
      node = sm_bindingList.GetFirst();
      while (node)
***************
*** 1602,1620 ****
          for (i = 0; i < class_count; ++i, ++wxlClass)
          {
!             if (wxlClass->baseclassName) // does it have a name
              {
!                 wxLuaBindingList::compatibility_iterator basenode = sm_bindingList.GetFirst();
!                 while (basenode)
                  {
!                     wxLuaBinding* basebinding = basenode->GetData();
! 
!                     wxLuaBindClass* wxlBaseClass = (wxLuaBindClass*)basebinding->GetBindClass(wxlClass->baseclassName);
                      if (wxlBaseClass)
!                     {
!                         wxlClass->baseclass = wxlBaseClass;
!                         break;
!                     }
! 
!                     basenode = basenode->GetNext();
                  }
              }
--- 1664,1675 ----
          for (i = 0; i < class_count; ++i, ++wxlClass)
          {
!             if (wxlClass->baseclassNames) // does it have any base classes at all?
              {
!                 // find the base class using their names in the bindings
!                 for (size_t j = 0; wxlClass->baseclassNames[j]; ++j)
                  {
!                     wxLuaBindClass* wxlBaseClass = (wxLuaBindClass*)wxLuaBinding::FindBindClass(wxlClass->baseclassNames[j]);
                      if (wxlBaseClass)
!                         wxlClass->baseBindClasses[j] = wxlBaseClass;
                  }
              }
***************
*** 1635,1639 ****
          for (i = 0; i < class_count; ++i, ++wxlClass)
          {
!             if (wxlClass->baseclass) // does it have a base class at all?
              {
                  wxLuaBindMethod *wxlMethod = wxlClass->wxluamethods;
--- 1690,1694 ----
          for (i = 0; i < class_count; ++i, ++wxlClass)
          {
!             if (wxlClass->baseclassNames) // does it have any base classes at all?
              {
                  wxLuaBindMethod *wxlMethod = wxlClass->wxluamethods;
***************
*** 1642,1674 ****
                  for (j = 0; j < method_count; ++j, ++wxlMethod)
                  {
!                     // iterate through the base classes to find if this function is
!                     // an overload, but only if we haven't checked already.
!                     if (!WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_CHECKED_OVERLOAD|WXLUAMETHOD_DELETE))
!                     {
!                         wxLuaBindClass *baseClass = wxlClass->baseclass;
!                         wxLuaBindMethod *parentMethod = wxlMethod;
! 
!                         while (baseClass)
!                         {
!                             parentMethod->method_type |= WXLUAMETHOD_CHECKED_OVERLOAD; // have checked this
! 
!                             wxLuaBindMethod* baseMethod = wxLuaBinding::GetClassMethod(baseClass, wxlMethod->name, WXLUAMETHOD_SEARCH_MASK, false);
!                             if (baseMethod)
!                             {
!                                 // don't link to base class delete functions
!                                 if (!WXLUA_HASBIT(baseMethod->method_type, WXLUAMETHOD_DELETE))
!                                 {
!                                     parentMethod->basemethod = baseMethod;
!                                     parentMethod = baseMethod;
!                                 }
! 
!                                 // we have already checked the base classes below this
!                                 if (WXLUA_HASBIT(baseMethod->method_type, WXLUAMETHOD_CHECKED_OVERLOAD))
!                                     break;
!                             }
! 
!                             baseClass = baseClass->baseclass;
!                         }
!                     }
                  }
              }
--- 1697,1701 ----
                  for (j = 0; j < method_count; ++j, ++wxlMethod)
                  {
!                     wxLuaBinding_RecurseBaseMethods(wxlClass, wxlMethod, force_update);
                  }
              }

Index: wxlua_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxlua_bind.cpp	26 Mar 2008 05:01:33 -0000	1.30
--- wxlua_bind.cpp	14 May 2009 05:06:21 -0000	1.31
***************
*** 576,596 ****
              return 1;
          }
!         else if (strcmp(idx_str, "baseclassName") == 0)
          {
!             lua_pushstring(L, wxlClass->baseclassName);
!             return 1;
          }
!         else if (strcmp(idx_str, "baseclass") == 0)
          {
!             if (wxlClass->baseclass)
              {
!                 const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
!                 *ptr = wxlClass->baseclass;
!                     lua_newtable(L);
!                     lua_pushstring(L, "__index");
!                     lua_pushlightuserdata(L, wxlBinding);
!                     lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
!                     lua_rawset(L, -3);
!                     lua_setmetatable(L, -2);
  
                  return 1;
--- 576,619 ----
              return 1;
          }
!         else if (strcmp(idx_str, "baseclassNames") == 0)
          {
!             if (wxlClass->baseclassNames)
!             {
!                 lua_newtable(L);
!                 for (size_t i = 0; wxlClass->baseclassNames[i]; ++i)
!                 {
!                     lua_pushstring(L, wxlClass->baseclassNames[i]);
!                     lua_rawseti(L, -2, i + 1);
!                 }
!                 return 1;
!             }
! 
!             return 0;
          }
!         else if (strcmp(idx_str, "baseBindClasses") == 0)
          {
!             if (wxlClass->baseBindClasses)
              {
!                 lua_newtable(L);
!                 for (size_t i = 0; wxlClass->baseclassNames[i]; ++i) // use names to check for terminating NULL
!                 {
!                     if (wxlClass->baseBindClasses[i] == NULL) // may be NULL if not loaded
!                     {
!                         lua_pushnil(L);
!                     }
!                     else
!                     {
!                         const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
!                         *ptr = wxlClass->baseBindClasses[i];
!                             lua_newtable(L);
!                             lua_pushstring(L, "__index");
!                             lua_pushlightuserdata(L, wxlBinding);
!                             lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
!                             lua_rawset(L, -3);
!                             lua_setmetatable(L, -2);
!                     }
! 
!                     lua_rawseti(L, -2, i + 1);
!                 }
  
                  return 1;
***************
*** 805,808 ****
--- 828,850 ----
                  lua_rawset(L, -3);
  
+                 lua_pushstring(L, "wxLuaBindClass");
+                 const wxLuaBindClass* wxlClass = wxlBinding->GetBindClass(*wxlEvent->wxluatype);
+                 if (wxlClass == NULL)
+                 {
+                     lua_pushnil(L);
+                 }
+                 else
+                 {
+                     const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
+                     *ptr = wxlClass;
+                         lua_newtable(L);
+                         lua_pushstring(L, "__index");
+                         lua_pushlightuserdata(L, wxlBinding);
+                         lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
+                         lua_rawset(L, -3);
+                         lua_setmetatable(L, -2);
+                 }
+                 lua_rawset(L, -3);
+ 
                  lua_rawseti(L, -2, idx + 1);
              }
***************
*** 835,838 ****
--- 877,899 ----
                  lua_rawset(L, -3);
  
+                 lua_pushstring(L, "wxLuaBindClass");
+                 const wxLuaBindClass* wxlClass = wxlBinding->GetBindClass(*wxlObject->wxluatype);
+                 if (wxlClass == NULL)
+                 {
+                     lua_pushnil(L);
+                 }
+                 else
+                 {
+                     const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
+                     *ptr = wxlClass;
+                         lua_newtable(L);
+                         lua_pushstring(L, "__index");
+                         lua_pushlightuserdata(L, wxlBinding);
+                         lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
+                         lua_rawset(L, -3);
+                         lua_setmetatable(L, -2);
+                 }
+                 lua_rawset(L, -3);
+ 
                  lua_rawseti(L, -2, idx + 1);
              }
***************
*** 1049,1055 ****
      if (!wxlua_iswxluatype(l_type, WXLUA_TUSERDATA))
          wxlua_argerror(L, 1, wxT("a 'userdata'"));
!     
      void* o = wxlua_touserdata(L, 1, false);
!     
      if (wxluaO_isgcobject(L, o))
      {
--- 1110,1116 ----
      if (!wxlua_iswxluatype(l_type, WXLUA_TUSERDATA))
          wxlua_argerror(L, 1, wxT("a 'userdata'"));
! 
      void* o = wxlua_touserdata(L, 1, false);
! 
      if (wxluaO_isgcobject(L, o))
      {
***************
*** 1140,1149 ****
  // ---------------------------------------------------------------------------
  
  wxLuaBindClass* wxLuaGetClassList_wxlua(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { "wxLuaObject", wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &wxluatype_wxLuaObject, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxLuaState", wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &wxluatype_wxLuaState, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 
--- 1201,1220 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxLuaObject = "wxLuaObject";
+ static const char* wxluaclassname_wxLuaState = "wxLuaState";
+ static const char* wxluaclassname_wxObject = "wxObject";
+ 
+ static const char* wxluabaseclassnames_wxLuaObject[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLuaObject[] = { NULL };
+ static const char* wxluabaseclassnames_wxLuaState[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLuaState[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxlua(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { wxluaclassname_wxLuaObject, wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &wxluatype_wxLuaObject, wxluabaseclassnames_wxLuaObject, wxluabaseclassbinds_wxLuaObject, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxLuaState, wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &wxluatype_wxLuaState, wxluabaseclassnames_wxLuaState, wxluabaseclassbinds_wxLuaState, g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 

[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp, 1.18, 1.19 wxaui_bind.cpp, 1.15, 1.16 wxbase_bind.cpp, 1.17, 1.18 wxcore_bind.cpp, 1.21, 1.22 wxgl_bind.cpp, 1.10, 1.11 wxhtml_bind.cpp, 1.12, 1.13 wxmedia_bind.cpp, 1.11, 1.12 wxnet_bind.cpp, 1.13, 1.14 wxrichtext_bind.cpp, 1.9, 1.10 wxstc_bind.cpp, 1.13, 1.14 wxxml_bind.cpp, 1.11, 1.12 wxxrc_bind.cpp, 1.10, 1.11

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/modules/wxbind/src

Modified Files:
	wxadv_bind.cpp wxaui_bind.cpp wxbase_bind.cpp wxcore_bind.cpp 
	wxgl_bind.cpp wxhtml_bind.cpp wxmedia_bind.cpp wxnet_bind.cpp 
	wxrichtext_bind.cpp wxstc_bind.cpp wxxml_bind.cpp 
	wxxrc_bind.cpp 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxbase_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxbase_bind.cpp	31 Mar 2009 04:23:42 -0000	1.17
--- wxbase_bind.cpp	14 May 2009 05:06:21 -0000	1.18
***************
*** 2169,2172 ****
--- 2169,2296 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxArchiveFSHandler = "wxArchiveFSHandler";
+ static const char* wxluaclassname_wxArrayInt = "wxArrayInt";
+ static const char* wxluaclassname_wxArrayString = "wxArrayString";
+ static const char* wxluaclassname_wxClassInfo = "wxClassInfo";
+ static const char* wxluaclassname_wxClientData = "wxClientData";
+ static const char* wxluaclassname_wxClientDataContainer = "wxClientDataContainer";
+ static const char* wxluaclassname_wxConfig = "wxConfig";
+ static const char* wxluaclassname_wxConfigBase = "wxConfigBase";
+ static const char* wxluaclassname_wxConfigPathChanger = "wxConfigPathChanger";
+ static const char* wxluaclassname_wxCriticalSection = "wxCriticalSection";
+ static const char* wxluaclassname_wxCriticalSectionLocker = "wxCriticalSectionLocker";
+ static const char* wxluaclassname_wxDataInputStream = "wxDataInputStream";
+ static const char* wxluaclassname_wxDataOutputStream = "wxDataOutputStream";
+ static const char* wxluaclassname_wxDateSpan = "wxDateSpan";
+ static const char* wxluaclassname_wxDateTime = "wxDateTime";
+ static const char* wxluaclassname_wxDateTimeArray = "wxDateTimeArray";
+ static const char* wxluaclassname_wxDateTimeHolidayAuthority = "wxDateTimeHolidayAuthority";
+ static const char* wxluaclassname_wxDateTimeWorkDays = "wxDateTimeWorkDays";
+ static const char* wxluaclassname_wxDir = "wxDir";
+ static const char* wxluaclassname_wxDynamicLibrary = "wxDynamicLibrary";
+ static const char* wxluaclassname_wxDynamicLibraryDetails = "wxDynamicLibraryDetails";
+ static const char* wxluaclassname_wxDynamicLibraryDetailsArray = "wxDynamicLibraryDetailsArray";
+ static const char* wxluaclassname_wxFSFile = "wxFSFile";
+ static const char* wxluaclassname_wxFile = "wxFile";
+ static const char* wxluaclassname_wxFileConfig = "wxFileConfig";
+ static const char* wxluaclassname_wxFileInputStream = "wxFileInputStream";
+ static const char* wxluaclassname_wxFileName = "wxFileName";
+ static const char* wxluaclassname_wxFileOutputStream = "wxFileOutputStream";
+ static const char* wxluaclassname_wxFileSystem = "wxFileSystem";
+ static const char* wxluaclassname_wxFileSystemHandler = "wxFileSystemHandler";
+ static const char* wxluaclassname_wxFileType = "wxFileType";
+ static const char* wxluaclassname_wxFileTypeInfo = "wxFileTypeInfo";
+ static const char* wxluaclassname_wxFileType_MessageParameters = "wxFileType_MessageParameters";
+ static const char* wxluaclassname_wxFilterFSHandler = "wxFilterFSHandler";
+ static const char* wxluaclassname_wxIconLocation = "wxIconLocation";
+ static const char* wxluaclassname_wxInputStream = "wxInputStream";
+ static const char* wxluaclassname_wxInternetFSHandler = "wxInternetFSHandler";
+ static const char* wxluaclassname_wxLanguageInfo = "wxLanguageInfo";
+ static const char* wxluaclassname_wxList = "wxList";
+ static const char* wxluaclassname_wxLocalFSHandler = "wxLocalFSHandler";
+ static const char* wxluaclassname_wxLocale = "wxLocale";
+ static const char* wxluaclassname_wxLog = "wxLog";
+ static const char* wxluaclassname_wxLogBuffer = "wxLogBuffer";
+ static const char* wxluaclassname_wxLogChain = "wxLogChain";
+ static const char* wxluaclassname_wxLogNull = "wxLogNull";
+ static const char* wxluaclassname_wxLogPassThrough = "wxLogPassThrough";
+ static const char* wxluaclassname_wxLongLong = "wxLongLong";
+ static const char* wxluaclassname_wxMemoryConfig = "wxMemoryConfig";
+ static const char* wxluaclassname_wxMemoryInputStream = "wxMemoryInputStream";
+ static const char* wxluaclassname_wxMimeTypesManager = "wxMimeTypesManager";
+ static const char* wxluaclassname_wxNode = "wxNode";
+ static const char* wxluaclassname_wxObject = "wxObject";
+ static const char* wxluaclassname_wxObjectRefData = "wxObjectRefData";
+ static const char* wxluaclassname_wxOutputStream = "wxOutputStream";
+ static const char* wxluaclassname_wxPathList = "wxPathList";
+ static const char* wxluaclassname_wxPlatformInfo = "wxPlatformInfo";
+ static const char* wxluaclassname_wxRegEx = "wxRegEx";
+ static const char* wxluaclassname_wxSingleInstanceChecker = "wxSingleInstanceChecker";
+ static const char* wxluaclassname_wxSortedArrayString = "wxSortedArrayString";
+ static const char* wxluaclassname_wxStandardPaths = "wxStandardPaths";
+ static const char* wxluaclassname_wxStopWatch = "wxStopWatch";
+ static const char* wxluaclassname_wxStreamBase = "wxStreamBase";
+ static const char* wxluaclassname_wxString = "wxString";
+ static const char* wxluaclassname_wxStringClientData = "wxStringClientData";
+ static const char* wxluaclassname_wxStringTokenizer = "wxStringTokenizer";
+ static const char* wxluaclassname_wxSystemOptions = "wxSystemOptions";
+ static const char* wxluaclassname_wxTempFile = "wxTempFile";
+ static const char* wxluaclassname_wxTimeSpan = "wxTimeSpan";
+ static const char* wxluaclassname_wxULongLong = "wxULongLong";
+ 
+ static const char* wxluabaseclassnames_wxArchiveFSHandler[] = { wxluaclassname_wxFileSystemHandler, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxArchiveFSHandler[] = { NULL };
+ static const char* wxluabaseclassnames_wxConfig[] = { wxluaclassname_wxConfigBase, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxConfig[] = { NULL };
+ static const char* wxluabaseclassnames_wxDateTimeWorkDays[] = { wxluaclassname_wxDateTimeHolidayAuthority, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxDateTimeWorkDays[] = { NULL };
+ static const char* wxluabaseclassnames_wxFSFile[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFSFile[] = { NULL };
+ static const char* wxluabaseclassnames_wxFileConfig[] = { wxluaclassname_wxConfigBase, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFileConfig[] = { NULL };
+ static const char* wxluabaseclassnames_wxFileInputStream[] = { wxluaclassname_wxInputStream, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFileInputStream[] = { NULL };
+ static const char* wxluabaseclassnames_wxFileOutputStream[] = { wxluaclassname_wxOutputStream, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFileOutputStream[] = { NULL };
+ static const char* wxluabaseclassnames_wxFileSystem[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFileSystem[] = { NULL };
+ static const char* wxluabaseclassnames_wxFileSystemHandler[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFileSystemHandler[] = { NULL };
+ static const char* wxluabaseclassnames_wxFilterFSHandler[] = { wxluaclassname_wxFileSystemHandler, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFilterFSHandler[] = { NULL };
+ static const char* wxluabaseclassnames_wxInputStream[] = { wxluaclassname_wxStreamBase, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxInputStream[] = { NULL };
+ static const char* wxluabaseclassnames_wxInternetFSHandler[] = { wxluaclassname_wxFileSystemHandler, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxInternetFSHandler[] = { NULL };
+ static const char* wxluabaseclassnames_wxList[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxList[] = { NULL };
+ static const char* wxluabaseclassnames_wxLocalFSHandler[] = { wxluaclassname_wxFileSystemHandler, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLocalFSHandler[] = { NULL };
+ static const char* wxluabaseclassnames_wxLogBuffer[] = { wxluaclassname_wxLog, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLogBuffer[] = { NULL };
+ static const char* wxluabaseclassnames_wxLogChain[] = { wxluaclassname_wxLog, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLogChain[] = { NULL };
+ static const char* wxluabaseclassnames_wxLogNull[] = { wxluaclassname_wxLog, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLogNull[] = { NULL };
+ static const char* wxluabaseclassnames_wxLogPassThrough[] = { wxluaclassname_wxLogChain, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLogPassThrough[] = { NULL };
+ static const char* wxluabaseclassnames_wxMemoryConfig[] = { wxluaclassname_wxFileConfig, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxMemoryConfig[] = { NULL };
+ static const char* wxluabaseclassnames_wxMemoryInputStream[] = { wxluaclassname_wxInputStream, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxMemoryInputStream[] = { NULL };
+ static const char* wxluabaseclassnames_wxOutputStream[] = { wxluaclassname_wxStreamBase, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxOutputStream[] = { NULL };
+ static const char* wxluabaseclassnames_wxPathList[] = { wxluaclassname_wxArrayString, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxPathList[] = { NULL };
+ static const char* wxluabaseclassnames_wxSortedArrayString[] = { wxluaclassname_wxArrayString, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxSortedArrayString[] = { NULL };
+ static const char* wxluabaseclassnames_wxStringClientData[] = { wxluaclassname_wxClientData, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxStringClientData[] = { NULL };
+ static const char* wxluabaseclassnames_wxStringTokenizer[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxStringTokenizer[] = { NULL };
+ static const char* wxluabaseclassnames_wxSystemOptions[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxSystemOptions[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxbase(size_t &count)
  {
***************
*** 2174,2379 ****
      {
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { "wxArchiveFSHandler", wxArchiveFSHandler_methods, wxArchiveFSHandler_methodCount, CLASSINFO(wxArchiveFSHandler), &wxluatype_wxArchiveFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
  #if wxLUA_USE_wxArrayInt
!         { "wxArrayInt", wxArrayInt_methods, wxArrayInt_methodCount, NULL, &wxluatype_wxArrayInt, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxArrayInt
  
  #if wxLUA_USE_wxArrayString
!         { "wxArrayString", wxArrayString_methods, wxArrayString_methodCount, NULL, &wxluatype_wxArrayString, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxArrayString
  
  #if wxLUA_USE_wxClassInfo
!         { "wxClassInfo", wxClassInfo_methods, wxClassInfo_methodCount, NULL, &wxluatype_wxClassInfo, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxClassInfo
  
!         { "wxClientData", wxClientData_methods, wxClientData_methodCount, NULL, &wxluatype_wxClientData, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxClientDataContainer", wxClientDataContainer_methods, wxClientDataContainer_methodCount, NULL, &wxluatype_wxClientDataContainer, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
!         { "wxConfig", wxConfig_methods, wxConfig_methodCount, NULL, &wxluatype_wxConfig, "wxConfigBase", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxConfigBase", wxConfigBase_methods, wxConfigBase_methodCount, NULL, &wxluatype_wxConfigBase, NULL, NULL ,wxConfigBase_enums, wxConfigBase_enumCount, }, 
!         { "wxConfigPathChanger", wxConfigPathChanger_methods, wxConfigPathChanger_methodCount, NULL, &wxluatype_wxConfigPathChanger, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS
!         { "wxCriticalSection", wxCriticalSection_methods, wxCriticalSection_methodCount, NULL, &wxluatype_wxCriticalSection, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxCriticalSection && wxUSE_THREADS
  
  #if wxLUA_USE_wxCriticalSectionLocker
!         { "wxCriticalSectionLocker", wxCriticalSectionLocker_methods, wxCriticalSectionLocker_methodCount, NULL, &wxluatype_wxCriticalSectionLocker, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxCriticalSectionLocker
  
  #if wxUSE_STREAMS
!         { "wxDataInputStream", wxDataInputStream_methods, wxDataInputStream_methodCount, NULL, &wxluatype_wxDataInputStream, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxDataOutputStream", wxDataOutputStream_methods, wxDataOutputStream_methodCount, NULL, &wxluatype_wxDataOutputStream, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME
!         { "wxDateSpan", wxDateSpan_methods, wxDateSpan_methodCount, NULL, &wxluatype_wxDateSpan, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME
  
  #if wxLUA_USE_wxDateTime && wxUSE_DATETIME
!         { "wxDateTime", wxDateTime_methods, wxDateTime_methodCount, NULL, &wxluatype_wxDateTime, NULL, NULL ,wxDateTime_enums, wxDateTime_enumCount, }, 
!         { "wxDateTimeArray", wxDateTimeArray_methods, wxDateTimeArray_methodCount, NULL, &wxluatype_wxDateTimeArray, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME
  
  #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME
!         { "wxDateTimeHolidayAuthority", wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, NULL, &wxluatype_wxDateTimeHolidayAuthority, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxDateTimeWorkDays", wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, NULL, &wxluatype_wxDateTimeWorkDays, "wxDateTimeHolidayAuthority", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME
  
  #if wxLUA_USE_wxDir
!         { "wxDir", wxDir_methods, wxDir_methodCount, NULL, &wxluatype_wxDir, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDir
  
!         { "wxDynamicLibrary", wxDynamicLibrary_methods, wxDynamicLibrary_methodCount, NULL, &wxluatype_wxDynamicLibrary, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxDynamicLibraryDetails", wxDynamicLibraryDetails_methods, wxDynamicLibraryDetails_methodCount, NULL, &wxluatype_wxDynamicLibraryDetails, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxDynamicLibraryDetailsArray", wxDynamicLibraryDetailsArray_methods, wxDynamicLibraryDetailsArray_methodCount, NULL, &wxluatype_wxDynamicLibraryDetailsArray, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { "wxFSFile", wxFSFile_methods, wxFSFile_methodCount, CLASSINFO(wxFSFile), &wxluatype_wxFSFile, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
  #if wxLUA_USE_wxFile && wxUSE_FILE
!         { "wxFile", wxFile_methods, wxFile_methodCount, NULL, &wxluatype_wxFile, NULL, NULL ,wxFile_enums, wxFile_enumCount, }, 
  #endif // wxLUA_USE_wxFile && wxUSE_FILE
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
!         { "wxFileConfig", wxFileConfig_methods, wxFileConfig_methodCount, NULL, &wxluatype_wxFileConfig, "wxConfigBase", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  #if wxUSE_STREAMS
!         { "wxFileInputStream", wxFileInputStream_methods, wxFileInputStream_methodCount, NULL, &wxluatype_wxFileInputStream, "wxInputStream", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if wxLUA_USE_wxFileName
!         { "wxFileName", wxFileName_methods, wxFileName_methodCount, NULL, &wxluatype_wxFileName, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxFileName
  
  #if wxUSE_STREAMS
!         { "wxFileOutputStream", wxFileOutputStream_methods, wxFileOutputStream_methodCount, NULL, &wxluatype_wxFileOutputStream, "wxOutputStream", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { "wxFileSystem", wxFileSystem_methods, wxFileSystem_methodCount, NULL, &wxluatype_wxFileSystem, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxFileSystemHandler", wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
!         { "wxFileType", wxFileType_methods, wxFileType_methodCount, NULL, &wxluatype_wxFileType, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxFileTypeInfo", wxFileTypeInfo_methods, wxFileTypeInfo_methodCount, NULL, &wxluatype_wxFileTypeInfo, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxFileType_MessageParameters", wxFileType_MessageParameters_methods, wxFileType_MessageParameters_methodCount, NULL, &wxluatype_wxFileType_MessageParameters, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { "wxFilterFSHandler", wxFilterFSHandler_methods, wxFilterFSHandler_methodCount, CLASSINFO(wxFilterFSHandler), &wxluatype_wxFilterFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
!         { "wxIconLocation", wxIconLocation_methods, wxIconLocation_methodCount, NULL, &wxluatype_wxIconLocation, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  
  #if wxUSE_STREAMS
!         { "wxInputStream", wxInputStream_methods, wxInputStream_methodCount, NULL, &wxluatype_wxInputStream, "wxStreamBase", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
!         { "wxInternetFSHandler", wxInternetFSHandler_methods, wxInternetFSHandler_methodCount, CLASSINFO(wxInternetFSHandler), &wxluatype_wxInternetFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
  
  #if wxUSE_INTL
!         { "wxLanguageInfo", wxLanguageInfo_methods, wxLanguageInfo_methodCount, NULL, &wxluatype_wxLanguageInfo, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_INTL
  
  #if wxLUA_USE_wxList && !wxUSE_STL
!         { "wxList", wxList_methods, wxList_methodCount, CLASSINFO(wxList), &wxluatype_wxList, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxList && !wxUSE_STL
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { "wxLocalFSHandler", wxLocalFSHandler_methods, wxLocalFSHandler_methodCount, CLASSINFO(wxLocalFSHandler), &wxluatype_wxLocalFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
  #if wxUSE_INTL
!         { "wxLocale", wxLocale_methods, wxLocale_methodCount, NULL, &wxluatype_wxLocale, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_INTL
  
  #if wxLUA_USE_wxLog && wxUSE_LOG
!         { "wxLog", wxLog_methods, wxLog_methodCount, NULL, &wxluatype_wxLog, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxLogBuffer", wxLogBuffer_methods, wxLogBuffer_methodCount, NULL, &wxluatype_wxLogBuffer, "wxLog", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxLogChain", wxLogChain_methods, wxLogChain_methodCount, NULL, &wxluatype_wxLogChain, "wxLog", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxLogNull", wxLogNull_methods, wxLogNull_methodCount, NULL, &wxluatype_wxLogNull, "wxLog", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxLogPassThrough", wxLogPassThrough_methods, wxLogPassThrough_methodCount, NULL, &wxluatype_wxLogPassThrough, "wxLogChain", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxLog && wxUSE_LOG
  
  #if wxUSE_LONGLONG
!         { "wxLongLong", wxLongLong_methods, wxLongLong_methodCount, NULL, &wxluatype_wxLongLong, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_LONGLONG
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
!         { "wxMemoryConfig", wxMemoryConfig_methods, wxMemoryConfig_methodCount, NULL, &wxluatype_wxMemoryConfig, "wxFileConfig", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  #if wxUSE_STREAMS
!         { "wxMemoryInputStream", wxMemoryInputStream_methods, wxMemoryInputStream_methodCount, NULL, &wxluatype_wxMemoryInputStream, "wxInputStream", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
!         { "wxMimeTypesManager", wxMimeTypesManager_methods, wxMimeTypesManager_methodCount, NULL, &wxluatype_wxMimeTypesManager, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxList && !wxUSE_STL
!         { "wxNode", wxNode_methods, wxNode_methodCount, NULL, &wxluatype_wxNode, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxList && !wxUSE_STL
  
  #if wxLUA_USE_wxObject
!         { "wxObject", wxObject_methods, wxObject_methodCount, CLASSINFO(wxObject), &wxluatype_wxObject, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxObjectRefData", wxObjectRefData_methods, wxObjectRefData_methodCount, NULL, &wxluatype_wxObjectRefData, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxObject
  
  #if wxUSE_STREAMS
!         { "wxOutputStream", wxOutputStream_methods, wxOutputStream_methodCount, NULL, &wxluatype_wxOutputStream, "wxStreamBase", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
!         { "wxPathList", wxPathList_methods, wxPathList_methodCount, NULL, &wxluatype_wxPathList, "wxArrayString", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxPlatformInfo", wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &wxluatype_wxPlatformInfo, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxRegEx && wxUSE_REGEX
!         { "wxRegEx", wxRegEx_methods, wxRegEx_methodCount, NULL, &wxluatype_wxRegEx, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX
  
  #if wxUSE_SNGLINST_CHECKER
!         { "wxSingleInstanceChecker", wxSingleInstanceChecker_methods, wxSingleInstanceChecker_methodCount, NULL, &wxluatype_wxSingleInstanceChecker, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_SNGLINST_CHECKER
  
  #if wxLUA_USE_wxArrayString
!         { "wxSortedArrayString", wxSortedArrayString_methods, wxSortedArrayString_methodCount, NULL, &wxluatype_wxSortedArrayString, "wxArrayString", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxArrayString
  
  #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths
!         { "wxStandardPaths", wxStandardPaths_methods, wxStandardPaths_methodCount, NULL, &wxluatype_wxStandardPaths, NULL, NULL ,wxStandardPaths_enums, wxStandardPaths_enumCount, }, 
  #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths
  
  #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH
!         { "wxStopWatch", wxStopWatch_methods, wxStopWatch_methodCount, NULL, &wxluatype_wxStopWatch, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH
  
  #if wxUSE_STREAMS
!         { "wxStreamBase", wxStreamBase_methods, wxStreamBase_methodCount, NULL, &wxluatype_wxStreamBase, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
!         { "wxString", wxString_methods, wxString_methodCount, NULL, &wxluatype_wxString, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxStringClientData", wxStringClientData_methods, wxStringClientData_methodCount, NULL, &wxluatype_wxStringClientData, "wxClientData", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxStringTokenizer", wxStringTokenizer_methods, wxStringTokenizer_methodCount, NULL, &wxluatype_wxStringTokenizer, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxSystemOptions
!         { "wxSystemOptions", wxSystemOptions_methods, wxSystemOptions_methodCount, NULL, &wxluatype_wxSystemOptions, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxSystemOptions
  
  #if wxLUA_USE_wxFile && wxUSE_FILE
!         { "wxTempFile", wxTempFile_methods, wxTempFile_methodCount, NULL, &wxluatype_wxTempFile, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxFile && wxUSE_FILE
  
  #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME
!         { "wxTimeSpan", wxTimeSpan_methods, wxTimeSpan_methodCount, NULL, &wxluatype_wxTimeSpan, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME
  
  #if wxUSE_LONGLONG
!         { "wxULongLong", wxULongLong_methods, wxULongLong_methodCount, NULL, &wxluatype_wxULongLong, NULL, NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_LONGLONG
  
--- 2298,2503 ----
      {
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { wxluaclassname_wxArchiveFSHandler, wxArchiveFSHandler_methods, wxArchiveFSHandler_methodCount, CLASSINFO(wxArchiveFSHandler), &wxluatype_wxArchiveFSHandler, wxluabaseclassnames_wxArchiveFSHandler, wxluabaseclassbinds_wxArchiveFSHandler, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
  #if wxLUA_USE_wxArrayInt
!         { wxluaclassname_wxArrayInt, wxArrayInt_methods, wxArrayInt_methodCount, NULL, &wxluatype_wxArrayInt, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxArrayInt
  
  #if wxLUA_USE_wxArrayString
!         { wxluaclassname_wxArrayString, wxArrayString_methods, wxArrayString_methodCount, NULL, &wxluatype_wxArrayString, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxArrayString
  
  #if wxLUA_USE_wxClassInfo
!         { wxluaclassname_wxClassInfo, wxClassInfo_methods, wxClassInfo_methodCount, NULL, &wxluatype_wxClassInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxClassInfo
  
!         { wxluaclassname_wxClientData, wxClientData_methods, wxClientData_methodCount, NULL, &wxluatype_wxClientData, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxClientDataContainer, wxClientDataContainer_methods, wxClientDataContainer_methodCount, NULL, &wxluatype_wxClientDataContainer, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
!         { wxluaclassname_wxConfig, wxConfig_methods, wxConfig_methodCount, NULL, &wxluatype_wxConfig, wxluabaseclassnames_wxConfig, wxluabaseclassbinds_wxConfig, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxConfigBase, wxConfigBase_methods, wxConfigBase_methodCount, NULL, &wxluatype_wxConfigBase, NULL, NULL, wxConfigBase_enums, wxConfigBase_enumCount, }, 
!         { wxluaclassname_wxConfigPathChanger, wxConfigPathChanger_methods, wxConfigPathChanger_methodCount, NULL, &wxluatype_wxConfigPathChanger, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS
!         { wxluaclassname_wxCriticalSection, wxCriticalSection_methods, wxCriticalSection_methodCount, NULL, &wxluatype_wxCriticalSection, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxCriticalSection && wxUSE_THREADS
  
  #if wxLUA_USE_wxCriticalSectionLocker
!         { wxluaclassname_wxCriticalSectionLocker, wxCriticalSectionLocker_methods, wxCriticalSectionLocker_methodCount, NULL, &wxluatype_wxCriticalSectionLocker, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxCriticalSectionLocker
  
  #if wxUSE_STREAMS
!         { wxluaclassname_wxDataInputStream, wxDataInputStream_methods, wxDataInputStream_methodCount, NULL, &wxluatype_wxDataInputStream, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxDataOutputStream, wxDataOutputStream_methods, wxDataOutputStream_methodCount, NULL, &wxluatype_wxDataOutputStream, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME
!         { wxluaclassname_wxDateSpan, wxDateSpan_methods, wxDateSpan_methodCount, NULL, &wxluatype_wxDateSpan, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME
  
  #if wxLUA_USE_wxDateTime && wxUSE_DATETIME
!         { wxluaclassname_wxDateTime, wxDateTime_methods, wxDateTime_methodCount, NULL, &wxluatype_wxDateTime, NULL, NULL, wxDateTime_enums, wxDateTime_enumCount, }, 
!         { wxluaclassname_wxDateTimeArray, wxDateTimeArray_methods, wxDateTimeArray_methodCount, NULL, &wxluatype_wxDateTimeArray, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME
  
  #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME
!         { wxluaclassname_wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, NULL, &wxluatype_wxDateTimeHolidayAuthority, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxDateTimeWorkDays, wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, NULL, &wxluatype_wxDateTimeWorkDays, wxluabaseclassnames_wxDateTimeWorkDays, wxluabaseclassbinds_wxDateTimeWorkDays, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME
  
  #if wxLUA_USE_wxDir
!         { wxluaclassname_wxDir, wxDir_methods, wxDir_methodCount, NULL, &wxluatype_wxDir, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxDir
  
!         { wxluaclassname_wxDynamicLibrary, wxDynamicLibrary_methods, wxDynamicLibrary_methodCount, NULL, &wxluatype_wxDynamicLibrary, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxDynamicLibraryDetails, wxDynamicLibraryDetails_methods, wxDynamicLibraryDetails_methodCount, NULL, &wxluatype_wxDynamicLibraryDetails, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxDynamicLibraryDetailsArray, wxDynamicLibraryDetailsArray_methods, wxDynamicLibraryDetailsArray_methodCount, NULL, &wxluatype_wxDynamicLibraryDetailsArray, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { wxluaclassname_wxFSFile, wxFSFile_methods, wxFSFile_methodCount, CLASSINFO(wxFSFile), &wxluatype_wxFSFile, wxluabaseclassnames_wxFSFile, wxluabaseclassbinds_wxFSFile, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
  #if wxLUA_USE_wxFile && wxUSE_FILE
!         { wxluaclassname_wxFile, wxFile_methods, wxFile_methodCount, NULL, &wxluatype_wxFile, NULL, NULL, wxFile_enums, wxFile_enumCount, }, 
  #endif // wxLUA_USE_wxFile && wxUSE_FILE
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
!         { wxluaclassname_wxFileConfig, wxFileConfig_methods, wxFileConfig_methodCount, NULL, &wxluatype_wxFileConfig, wxluabaseclassnames_wxFileConfig, wxluabaseclassbinds_wxFileConfig, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  #if wxUSE_STREAMS
!         { wxluaclassname_wxFileInputStream, wxFileInputStream_methods, wxFileInputStream_methodCount, NULL, &wxluatype_wxFileInputStream, wxluabaseclassnames_wxFileInputStream, wxluabaseclassbinds_wxFileInputStream, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if wxLUA_USE_wxFileName
!         { wxluaclassname_wxFileName, wxFileName_methods, wxFileName_methodCount, NULL, &wxluatype_wxFileName, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxFileName
  
  #if wxUSE_STREAMS
!         { wxluaclassname_wxFileOutputStream, wxFileOutputStream_methods, wxFileOutputStream_methodCount, NULL, &wxluatype_wxFileOutputStream, wxluabaseclassnames_wxFileOutputStream, wxluabaseclassbinds_wxFileOutputStream, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { wxluaclassname_wxFileSystem, wxFileSystem_methods, wxFileSystem_methodCount, NULL, &wxluatype_wxFileSystem, wxluabaseclassnames_wxFileSystem, wxluabaseclassbinds_wxFileSystem, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxFileSystemHandler, wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, wxluabaseclassnames_wxFileSystemHandler, wxluabaseclassbinds_wxFileSystemHandler, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
!         { wxluaclassname_wxFileType, wxFileType_methods, wxFileType_methodCount, NULL, &wxluatype_wxFileType, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxFileTypeInfo, wxFileTypeInfo_methods, wxFileTypeInfo_methodCount, NULL, &wxluatype_wxFileTypeInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxFileType_MessageParameters, wxFileType_MessageParameters_methods, wxFileType_MessageParameters_methodCount, NULL, &wxluatype_wxFileType_MessageParameters, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { wxluaclassname_wxFilterFSHandler, wxFilterFSHandler_methods, wxFilterFSHandler_methodCount, CLASSINFO(wxFilterFSHandler), &wxluatype_wxFilterFSHandler, wxluabaseclassnames_wxFilterFSHandler, wxluabaseclassbinds_wxFilterFSHandler, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
!         { wxluaclassname_wxIconLocation, wxIconLocation_methods, wxIconLocation_methodCount, NULL, &wxluatype_wxIconLocation, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  
  #if wxUSE_STREAMS
!         { wxluaclassname_wxInputStream, wxInputStream_methods, wxInputStream_methodCount, NULL, &wxluatype_wxInputStream, wxluabaseclassnames_wxInputStream, wxluabaseclassbinds_wxInputStream, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
!         { wxluaclassname_wxInternetFSHandler, wxInternetFSHandler_methods, wxInternetFSHandler_methodCount, CLASSINFO(wxInternetFSHandler), &wxluatype_wxInternetFSHandler, wxluabaseclassnames_wxInternetFSHandler, wxluabaseclassbinds_wxInternetFSHandler, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
  
  #if wxUSE_INTL
!         { wxluaclassname_wxLanguageInfo, wxLanguageInfo_methods, wxLanguageInfo_methodCount, NULL, &wxluatype_wxLanguageInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_INTL
  
  #if wxLUA_USE_wxList && !wxUSE_STL
!         { wxluaclassname_wxList, wxList_methods, wxList_methodCount, CLASSINFO(wxList), &wxluatype_wxList, wxluabaseclassnames_wxList, wxluabaseclassbinds_wxList, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxList && !wxUSE_STL
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { wxluaclassname_wxLocalFSHandler, wxLocalFSHandler_methods, wxLocalFSHandler_methodCount, CLASSINFO(wxLocalFSHandler), &wxluatype_wxLocalFSHandler, wxluabaseclassnames_wxLocalFSHandler, wxluabaseclassbinds_wxLocalFSHandler, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
  
  #if wxUSE_INTL
!         { wxluaclassname_wxLocale, wxLocale_methods, wxLocale_methodCount, NULL, &wxluatype_wxLocale, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_INTL
  
  #if wxLUA_USE_wxLog && wxUSE_LOG
!         { wxluaclassname_wxLog, wxLog_methods, wxLog_methodCount, NULL, &wxluatype_wxLog, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxLogBuffer, wxLogBuffer_methods, wxLogBuffer_methodCount, NULL, &wxluatype_wxLogBuffer, wxluabaseclassnames_wxLogBuffer, wxluabaseclassbinds_wxLogBuffer, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxLogChain, wxLogChain_methods, wxLogChain_methodCount, NULL, &wxluatype_wxLogChain, wxluabaseclassnames_wxLogChain, wxluabaseclassbinds_wxLogChain, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxLogNull, wxLogNull_methods, wxLogNull_methodCount, NULL, &wxluatype_wxLogNull, wxluabaseclassnames_wxLogNull, wxluabaseclassbinds_wxLogNull, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxLogPassThrough, wxLogPassThrough_methods, wxLogPassThrough_methodCount, NULL, &wxluatype_wxLogPassThrough, wxluabaseclassnames_wxLogPassThrough, wxluabaseclassbinds_wxLogPassThrough, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxLog && wxUSE_LOG
  
  #if wxUSE_LONGLONG
!         { wxluaclassname_wxLongLong, wxLongLong_methods, wxLongLong_methodCount, NULL, &wxluatype_wxLongLong, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_LONGLONG
  
  #if wxLUA_USE_wxConfig && wxUSE_CONFIG
!         { wxluaclassname_wxMemoryConfig, wxMemoryConfig_methods, wxMemoryConfig_methodCount, NULL, &wxluatype_wxMemoryConfig, wxluabaseclassnames_wxMemoryConfig, wxluabaseclassbinds_wxMemoryConfig, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG
  
  #if wxUSE_STREAMS
!         { wxluaclassname_wxMemoryInputStream, wxMemoryInputStream_methods, wxMemoryInputStream_methodCount, NULL, &wxluatype_wxMemoryInputStream, wxluabaseclassnames_wxMemoryInputStream, wxluabaseclassbinds_wxMemoryInputStream, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
!         { wxluaclassname_wxMimeTypesManager, wxMimeTypesManager_methods, wxMimeTypesManager_methodCount, NULL, &wxluatype_wxMimeTypesManager, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxList && !wxUSE_STL
!         { wxluaclassname_wxNode, wxNode_methods, wxNode_methodCount, NULL, &wxluatype_wxNode, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxList && !wxUSE_STL
  
  #if wxLUA_USE_wxObject
!         { wxluaclassname_wxObject, wxObject_methods, wxObject_methodCount, CLASSINFO(wxObject), &wxluatype_wxObject, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxObjectRefData, wxObjectRefData_methods, wxObjectRefData_methodCount, NULL, &wxluatype_wxObjectRefData, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxObject
  
  #if wxUSE_STREAMS
!         { wxluaclassname_wxOutputStream, wxOutputStream_methods, wxOutputStream_methodCount, NULL, &wxluatype_wxOutputStream, wxluabaseclassnames_wxOutputStream, wxluabaseclassbinds_wxOutputStream, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
!         { wxluaclassname_wxPathList, wxPathList_methods, wxPathList_methodCount, NULL, &wxluatype_wxPathList, wxluabaseclassnames_wxPathList, wxluabaseclassbinds_wxPathList, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxPlatformInfo, wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &wxluatype_wxPlatformInfo, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxRegEx && wxUSE_REGEX
!         { wxluaclassname_wxRegEx, wxRegEx_methods, wxRegEx_methodCount, NULL, &wxluatype_wxRegEx, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX
  
  #if wxUSE_SNGLINST_CHECKER
!         { wxluaclassname_wxSingleInstanceChecker, wxSingleInstanceChecker_methods, wxSingleInstanceChecker_methodCount, NULL, &wxluatype_wxSingleInstanceChecker, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_SNGLINST_CHECKER
  
  #if wxLUA_USE_wxArrayString
!         { wxluaclassname_wxSortedArrayString, wxSortedArrayString_methods, wxSortedArrayString_methodCount, NULL, &wxluatype_wxSortedArrayString, wxluabaseclassnames_wxSortedArrayString, wxluabaseclassbinds_wxSortedArrayString, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxArrayString
  
  #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths
!         { wxluaclassname_wxStandardPaths, wxStandardPaths_methods, wxStandardPaths_methodCount, NULL, &wxluatype_wxStandardPaths, NULL, NULL, wxStandardPaths_enums, wxStandardPaths_enumCount, }, 
  #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths
  
  #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH
!         { wxluaclassname_wxStopWatch, wxStopWatch_methods, wxStopWatch_methodCount, NULL, &wxluatype_wxStopWatch, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH
  
  #if wxUSE_STREAMS
!         { wxluaclassname_wxStreamBase, wxStreamBase_methods, wxStreamBase_methodCount, NULL, &wxluatype_wxStreamBase, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_STREAMS
  
!         { wxluaclassname_wxString, wxString_methods, wxString_methodCount, NULL, &wxluatype_wxString, NULL, NULL, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxStringClientData, wxStringClientData_methods, wxStringClientData_methodCount, NULL, &wxluatype_wxStringClientData, wxluabaseclassnames_wxStringClientData, wxluabaseclassbinds_wxStringClientData, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxStringTokenizer, wxStringTokenizer_methods, wxStringTokenizer_methodCount, NULL, &wxluatype_wxStringTokenizer, wxluabaseclassnames_wxStringTokenizer, wxluabaseclassbinds_wxStringTokenizer, g_wxluanumberArray_None, 0, }, 
  
  #if wxLUA_USE_wxSystemOptions
!         { wxluaclassname_wxSystemOptions, wxSystemOptions_methods, wxSystemOptions_methodCount, NULL, &wxluatype_wxSystemOptions, wxluabaseclassnames_wxSystemOptions, wxluabaseclassbinds_wxSystemOptions, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxSystemOptions
  
  #if wxLUA_USE_wxFile && wxUSE_FILE
!         { wxluaclassname_wxTempFile, wxTempFile_methods, wxTempFile_methodCount, NULL, &wxluatype_wxTempFile, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxFile && wxUSE_FILE
  
  #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME
!         { wxluaclassname_wxTimeSpan, wxTimeSpan_methods, wxTimeSpan_methodCount, NULL, &wxluatype_wxTimeSpan, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME
  
  #if wxUSE_LONGLONG
!         { wxluaclassname_wxULongLong, wxULongLong_methods, wxULongLong_methodCount, NULL, &wxluatype_wxULongLong, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxUSE_LONGLONG
  

Index: wxnet_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxnet_bind.cpp	31 Mar 2009 04:23:42 -0000	1.13
--- wxnet_bind.cpp	14 May 2009 05:06:21 -0000	1.14
***************
*** 2892,2895 ****
--- 2892,2936 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxEvent = "wxEvent";
+ static const char* wxluaclassname_wxFTP = "wxFTP";
+ static const char* wxluaclassname_wxHTTP = "wxHTTP";
+ static const char* wxluaclassname_wxIPV4address = "wxIPV4address";
+ static const char* wxluaclassname_wxIPaddress = "wxIPaddress";
+ static const char* wxluaclassname_wxObject = "wxObject";
+ static const char* wxluaclassname_wxProtocol = "wxProtocol";
+ static const char* wxluaclassname_wxSockAddress = "wxSockAddress";
+ static const char* wxluaclassname_wxSocketBase = "wxSocketBase";
+ static const char* wxluaclassname_wxSocketClient = "wxSocketClient";
+ static const char* wxluaclassname_wxSocketEvent = "wxSocketEvent";
+ static const char* wxluaclassname_wxSocketServer = "wxSocketServer";
+ static const char* wxluaclassname_wxURI = "wxURI";
+ static const char* wxluaclassname_wxURL = "wxURL";
+ 
+ static const char* wxluabaseclassnames_wxFTP[] = { wxluaclassname_wxProtocol, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxFTP[] = { NULL };
+ static const char* wxluabaseclassnames_wxHTTP[] = { wxluaclassname_wxProtocol, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxHTTP[] = { NULL };
+ static const char* wxluabaseclassnames_wxIPV4address[] = { wxluaclassname_wxIPaddress, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxIPV4address[] = { NULL };
+ static const char* wxluabaseclassnames_wxIPaddress[] = { wxluaclassname_wxSockAddress, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxIPaddress[] = { NULL };
+ static const char* wxluabaseclassnames_wxProtocol[] = { wxluaclassname_wxSocketClient, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxProtocol[] = { NULL };
+ static const char* wxluabaseclassnames_wxSockAddress[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxSockAddress[] = { NULL };
+ static const char* wxluabaseclassnames_wxSocketBase[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxSocketBase[] = { NULL };
+ static const char* wxluabaseclassnames_wxSocketClient[] = { wxluaclassname_wxSocketBase, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxSocketClient[] = { NULL };
+ static const char* wxluabaseclassnames_wxSocketEvent[] = { wxluaclassname_wxEvent, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxSocketEvent[] = { NULL };
+ static const char* wxluabaseclassnames_wxSocketServer[] = { wxluaclassname_wxSocketBase, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxSocketServer[] = { NULL };
+ static const char* wxluabaseclassnames_wxURI[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxURI[] = { NULL };
+ static const char* wxluabaseclassnames_wxURL[] = { wxluaclassname_wxURI, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxURL[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxnet(size_t &count)
  {
***************
*** 2897,2927 ****
      {
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP)
!         { "wxFTP", wxFTP_methods, wxFTP_methodCount, CLASSINFO(wxFTP), &wxluatype_wxFTP, "wxProtocol", NULL ,wxFTP_enums, wxFTP_enumCount, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP)
  
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP)
!         { "wxHTTP", wxHTTP_methods, wxHTTP_methodCount, CLASSINFO(wxHTTP), &wxluatype_wxHTTP, "wxProtocol", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP)
  
  #if wxLUA_USE_wxSocket && wxUSE_SOCKETS
!         { "wxIPV4address", wxIPV4address_methods, wxIPV4address_methodCount, CLASSINFO(wxIPV4address), &wxluatype_wxIPV4address, "wxIPaddress", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxIPaddress", wxIPaddress_methods, wxIPaddress_methodCount, CLASSINFO(wxIPaddress), &wxluatype_wxIPaddress, "wxSockAddress", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxSocket && wxUSE_SOCKETS
  
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL)
!         { "wxProtocol", wxProtocol_methods, wxProtocol_methodCount, CLASSINFO(wxProtocol), &wxluatype_wxProtocol, "wxSocketClient", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL)
  
  #if wxLUA_USE_wxSocket && wxUSE_SOCKETS
!         { "wxSockAddress", wxSockAddress_methods, wxSockAddress_methodCount, CLASSINFO(wxSockAddress), &wxluatype_wxSockAddress, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxSocketBase", wxSocketBase_methods, wxSocketBase_methodCount, CLASSINFO(wxSocketBase), &wxluatype_wxSocketBase, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxSocketClient", wxSocketClient_methods, wxSocketClient_methodCount, CLASSINFO(wxSocketClient), &wxluatype_wxSocketClient, "wxSocketBase", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxSocketEvent", wxSocketEvent_methods, wxSocketEvent_methodCount, CLASSINFO(wxSocketEvent), &wxluatype_wxSocketEvent, "wxEvent", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxSocketServer", wxSocketServer_methods, wxSocketServer_methodCount, CLASSINFO(wxSocketServer), &wxluatype_wxSocketServer, "wxSocketBase", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxURI", wxURI_methods, wxURI_methodCount, CLASSINFO(wxURI), &wxluatype_wxURI, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxSocket && wxUSE_SOCKETS
  
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)
!         { "wxURL", wxURL_methods, wxURL_methodCount, CLASSINFO(wxURL), &wxluatype_wxURL, "wxURI", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)
  
--- 2938,2968 ----
      {
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP)
!         { wxluaclassname_wxFTP, wxFTP_methods, wxFTP_methodCount, CLASSINFO(wxFTP), &wxluatype_wxFTP, wxluabaseclassnames_wxFTP, wxluabaseclassbinds_wxFTP, wxFTP_enums, wxFTP_enumCount, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP)
  
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP)
!         { wxluaclassname_wxHTTP, wxHTTP_methods, wxHTTP_methodCount, CLASSINFO(wxHTTP), &wxluatype_wxHTTP, wxluabaseclassnames_wxHTTP, wxluabaseclassbinds_wxHTTP, g_wxluanumberArray_None, 0, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP)
  
  #if wxLUA_USE_wxSocket && wxUSE_SOCKETS
!         { wxluaclassname_wxIPV4address, wxIPV4address_methods, wxIPV4address_methodCount, CLASSINFO(wxIPV4address), &wxluatype_wxIPV4address, wxluabaseclassnames_wxIPV4address, wxluabaseclassbinds_wxIPV4address, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxIPaddress, wxIPaddress_methods, wxIPaddress_methodCount, CLASSINFO(wxIPaddress), &wxluatype_wxIPaddress, wxluabaseclassnames_wxIPaddress, wxluabaseclassbinds_wxIPaddress, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxSocket && wxUSE_SOCKETS
  
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL)
!         { wxluaclassname_wxProtocol, wxProtocol_methods, wxProtocol_methodCount, CLASSINFO(wxProtocol), &wxluatype_wxProtocol, wxluabaseclassnames_wxProtocol, wxluabaseclassbinds_wxProtocol, g_wxluanumberArray_None, 0, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL)
  
  #if wxLUA_USE_wxSocket && wxUSE_SOCKETS
!         { wxluaclassname_wxSockAddress, wxSockAddress_methods, wxSockAddress_methodCount, CLASSINFO(wxSockAddress), &wxluatype_wxSockAddress, wxluabaseclassnames_wxSockAddress, wxluabaseclassbinds_wxSockAddress, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxSocketBase, wxSocketBase_methods, wxSocketBase_methodCount, CLASSINFO(wxSocketBase), &wxluatype_wxSocketBase, wxluabaseclassnames_wxSocketBase, wxluabaseclassbinds_wxSocketBase, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxSocketClient, wxSocketClient_methods, wxSocketClient_methodCount, CLASSINFO(wxSocketClient), &wxluatype_wxSocketClient, wxluabaseclassnames_wxSocketClient, wxluabaseclassbinds_wxSocketClient, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxSocketEvent, wxSocketEvent_methods, wxSocketEvent_methodCount, CLASSINFO(wxSocketEvent), &wxluatype_wxSocketEvent, wxluabaseclassnames_wxSocketEvent, wxluabaseclassbinds_wxSocketEvent, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxSocketServer, wxSocketServer_methods, wxSocketServer_methodCount, CLASSINFO(wxSocketServer), &wxluatype_wxSocketServer, wxluabaseclassnames_wxSocketServer, wxluabaseclassbinds_wxSocketServer, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxURI, wxURI_methods, wxURI_methodCount, CLASSINFO(wxURI), &wxluatype_wxURI, wxluabaseclassnames_wxURI, wxluabaseclassbinds_wxURI, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxSocket && wxUSE_SOCKETS
  
  #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)
!         { wxluaclassname_wxURL, wxURL_methods, wxURL_methodCount, CLASSINFO(wxURL), &wxluatype_wxURL, wxluabaseclassnames_wxURL, wxluabaseclassbinds_wxURL, g_wxluanumberArray_None, 0, }, 
  #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)
  

Index: wxstc_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxstc_bind.cpp	31 Mar 2009 04:23:42 -0000	1.13
--- wxstc_bind.cpp	14 May 2009 05:06:21 -0000	1.14
***************
*** 10230,10239 ****
  // ---------------------------------------------------------------------------
  
  wxLuaBindClass* wxLuaGetClassList_wxstc(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &wxluatype_wxStyledTextCtrl, "wxControl", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &wxluatype_wxStyledTextEvent, "wxCommandEvent", NULL ,g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 
--- 10230,10250 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxCommandEvent = "wxCommandEvent";
+ static const char* wxluaclassname_wxControl = "wxControl";
+ static const char* wxluaclassname_wxStyledTextCtrl = "wxStyledTextCtrl";
+ static const char* wxluaclassname_wxStyledTextEvent = "wxStyledTextEvent";
+ 
+ static const char* wxluabaseclassnames_wxStyledTextCtrl[] = { wxluaclassname_wxControl, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxStyledTextCtrl[] = { NULL };
+ static const char* wxluabaseclassnames_wxStyledTextEvent[] = { wxluaclassname_wxCommandEvent, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxStyledTextEvent[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxstc(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { wxluaclassname_wxStyledTextCtrl, wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, CLASSINFO(wxStyledTextCtrl), &wxluatype_wxStyledTextCtrl, wxluabaseclassnames_wxStyledTextCtrl, wxluabaseclassbinds_wxStyledTextCtrl, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxStyledTextEvent, wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, CLASSINFO(wxStyledTextEvent), &wxluatype_wxStyledTextEvent, wxluabaseclassnames_wxStyledTextEvent, wxluabaseclassbinds_wxStyledTextEvent, g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 

Index: wxgl_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_bind.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxgl_bind.cpp	29 Jan 2008 04:22:54 -0000	1.10
--- wxgl_bind.cpp	14 May 2009 05:06:21 -0000	1.11
***************
*** 698,701 ****
--- 698,712 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxGLCanvas = "wxGLCanvas";
+ static const char* wxluaclassname_wxGLContext = "wxGLContext";
+ static const char* wxluaclassname_wxObject = "wxObject";
+ static const char* wxluaclassname_wxWindow = "wxWindow";
+ 
+ static const char* wxluabaseclassnames_wxGLCanvas[] = { wxluaclassname_wxWindow, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxGLCanvas[] = { NULL };
+ static const char* wxluabaseclassnames_wxGLContext[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxGLContext[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxgl(size_t &count)
  {
***************
*** 703,708 ****
      {
  #if wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS
!         { "wxGLCanvas", wxGLCanvas_methods, wxGLCanvas_methodCount, CLASSINFO(wxGLCanvas), &wxluatype_wxGLCanvas, "wxWindow", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxGLContext", wxGLContext_methods, wxGLContext_methodCount, CLASSINFO(wxGLContext), &wxluatype_wxGLContext, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS
  
--- 714,719 ----
      {
  #if wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS
!         { wxluaclassname_wxGLCanvas, wxGLCanvas_methods, wxGLCanvas_methodCount, CLASSINFO(wxGLCanvas), &wxluatype_wxGLCanvas, wxluabaseclassnames_wxGLCanvas, wxluabaseclassbinds_wxGLCanvas, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxGLContext, wxGLContext_methods, wxGLContext_methodCount, CLASSINFO(wxGLContext), &wxluatype_wxGLContext, wxluabaseclassnames_wxGLContext, wxluabaseclassbinds_wxGLContext, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS
  

Index: wxxrc_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_bind.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxxrc_bind.cpp	29 Jan 2008 04:22:54 -0000	1.10
--- wxxrc_bind.cpp	14 May 2009 05:06:21 -0000	1.11
***************
*** 767,770 ****
--- 767,777 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxObject = "wxObject";
+ static const char* wxluaclassname_wxXmlResource = "wxXmlResource";
+ 
+ static const char* wxluabaseclassnames_wxXmlResource[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxXmlResource[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxxrc(size_t &count)
  {
***************
*** 772,776 ****
      {
  #if wxLUA_USE_wxXRC && wxUSE_XRC
!         { "wxXmlResource", wxXmlResource_methods, wxXmlResource_methodCount, NULL, &wxluatype_wxXmlResource, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxXRC && wxUSE_XRC
  
--- 779,783 ----
      {
  #if wxLUA_USE_wxXRC && wxUSE_XRC
!         { wxluaclassname_wxXmlResource, wxXmlResource_methods, wxXmlResource_methodCount, NULL, &wxluatype_wxXmlResource, wxluabaseclassnames_wxXmlResource, wxluabaseclassbinds_wxXmlResource, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxXRC && wxUSE_XRC
  

Index: wxmedia_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_bind.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxmedia_bind.cpp	24 Mar 2009 04:15:31 -0000	1.11
--- wxmedia_bind.cpp	14 May 2009 05:06:21 -0000	1.12
***************
*** 729,732 ****
--- 729,743 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxControl = "wxControl";
+ static const char* wxluaclassname_wxMediaCtrl = "wxMediaCtrl";
+ static const char* wxluaclassname_wxMediaEvent = "wxMediaEvent";
+ static const char* wxluaclassname_wxNotifyEvent = "wxNotifyEvent";
+ 
+ static const char* wxluabaseclassnames_wxMediaCtrl[] = { wxluaclassname_wxControl, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxMediaCtrl[] = { NULL };
+ static const char* wxluabaseclassnames_wxMediaEvent[] = { wxluaclassname_wxNotifyEvent, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxMediaEvent[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxmedia(size_t &count)
  {
***************
*** 734,739 ****
      {
  #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL
!         { "wxMediaCtrl", wxMediaCtrl_methods, wxMediaCtrl_methodCount, CLASSINFO(wxMediaCtrl), &wxluatype_wxMediaCtrl, "wxControl", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxMediaEvent", wxMediaEvent_methods, wxMediaEvent_methodCount, CLASSINFO(wxMediaEvent), &wxluatype_wxMediaEvent, "wxNotifyEvent", NULL ,g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL
  
--- 745,750 ----
      {
  #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL
!         { wxluaclassname_wxMediaCtrl, wxMediaCtrl_methods, wxMediaCtrl_methodCount, CLASSINFO(wxMediaCtrl), &wxluatype_wxMediaCtrl, wxluabaseclassnames_wxMediaCtrl, wxluabaseclassbinds_wxMediaCtrl, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxMediaEvent, wxMediaEvent_methods, wxMediaEvent_methodCount, CLASSINFO(wxMediaEvent), &wxluatype_wxMediaEvent, wxluabaseclassnames_wxMediaEvent, wxluabaseclassbinds_wxMediaEvent, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL
  

Index: wxcore_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxcore_bind.cpp	24 Mar 2009 04:15:18 -0000	1.21
--- wxcore_bind.cpp	14 May 2009 05:06:21 -0000	1.22
***************
*** 4175,41...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.65, 1.66

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/modules/wxluadebug/src

Modified Files:
	wxldebug.cpp 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** wxldebug.cpp	24 Jan 2008 00:18:18 -0000	1.65
--- wxldebug.cpp	14 May 2009 05:06:21 -0000	1.66
***************
*** 261,268 ****
  {
      wxCHECK_MSG(wxlClass, wxEmptyString, wxT("Invalid wxLuaBindClass"));
      return wxString::Format(wxT(" (%s, wxluatype=%d, classinfo=%s, baseclass=%s, methods=%d, enums=%d)"),
                              lua2wx(wxlClass->name).c_str(), *wxlClass->wxluatype,
                              wxString(wxlClass->classInfo ? wxlClass->classInfo->GetClassName() : wxEmptyString).c_str(),
!                             lua2wx(wxlClass->baseclassName).c_str(),
                              wxlClass->wxluamethods_n, wxlClass->enums_n);
  }
--- 261,275 ----
  {
      wxCHECK_MSG(wxlClass, wxEmptyString, wxT("Invalid wxLuaBindClass"));
+     wxString baseClasses;
+     if (wxlClass->baseclassNames)
+     {
+         for (size_t i = 0; wxlClass->baseclassNames[i]; ++i)
+             baseClasses += lua2wx(wxlClass->baseclassNames[i]) + wxT(",");
+     }
+ 
      return wxString::Format(wxT(" (%s, wxluatype=%d, classinfo=%s, baseclass=%s, methods=%d, enums=%d)"),
                              lua2wx(wxlClass->name).c_str(), *wxlClass->wxluatype,
                              wxString(wxlClass->classInfo ? wxlClass->classInfo->GetClassName() : wxEmptyString).c_str(),
!                             baseClasses.c_str(),
                              wxlClass->wxluamethods_n, wxlClass->enums_n);
  }

[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket_bind.cpp, 1.32, 1.33

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/modules/wxluasocket/src

Modified Files:
	wxluasocket_bind.cpp 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxluasocket_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** wxluasocket_bind.cpp	26 Mar 2008 05:23:48 -0000	1.32
--- wxluasocket_bind.cpp	14 May 2009 05:06:21 -0000	1.33
***************
*** 606,615 ****
  // ---------------------------------------------------------------------------
  
  wxLuaBindClass* wxLuaGetClassList_wxluasocket(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, "wxEvent", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, "wxEvtHandler", NULL ,g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 
--- 606,626 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxEvent = "wxEvent";
+ static const char* wxluaclassname_wxEvtHandler = "wxEvtHandler";
+ static const char* wxluaclassname_wxLuaDebuggerEvent = "wxLuaDebuggerEvent";
+ static const char* wxluaclassname_wxLuaDebuggerServer = "wxLuaDebuggerServer";
+ 
+ static const char* wxluabaseclassnames_wxLuaDebuggerEvent[] = { wxluaclassname_wxEvent, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLuaDebuggerEvent[] = { NULL };
+ static const char* wxluabaseclassnames_wxLuaDebuggerServer[] = { wxluaclassname_wxEvtHandler, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxLuaDebuggerServer[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxluasocket(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { wxluaclassname_wxLuaDebuggerEvent, wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &wxluatype_wxLuaDebuggerEvent, wxluabaseclassnames_wxLuaDebuggerEvent, wxluabaseclassbinds_wxLuaDebuggerEvent, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxLuaDebuggerServer, wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &wxluatype_wxLuaDebuggerServer, wxluabaseclassnames_wxLuaDebuggerServer, wxluabaseclassbinds_wxLuaDebuggerServer, g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h,1.85,1.86

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/modules/wxlua/include

Modified Files:
	wxlbind.h 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** wxlbind.h	17 Mar 2008 03:05:03 -0000	1.85
--- wxlbind.h	14 May 2009 05:06:21 -0000	1.86
***************
*** 57,60 ****
--- 57,67 ----
  #define WXLUATYPE_NULL         13 // C++ NULL, is full wxLua type with metatable
  
+ // Check that the Lua LUA_TXXX types are what they used to be
+ #if (LUA_TNONE != -1) || (LUA_TNIL != 0) || (LUA_TBOOLEAN != 1) || (LUA_TLIGHTUSERDATA != 2) || \
+     (LUA_TNUMBER != 3) || (LUA_TSTRING != 4) || (LUA_TTABLE != 5) || (LUA_TFUNCTION != 6) || \
+     (LUA_TUSERDATA != 7) || (LUA_TTHREAD != 8)
+ #   error "Lua has changed it's LUA_TXXX defines."
+ #endif
+ 
  // Is this wxLua type one of the basic Lua types
  #define WXLUAT_IS_LUAT(wxl_type) (((wxl_type) >= WXLUA_T_MIN) && ((wxl_type) <= WXLUA_T_MAX))
***************
*** 222,230 ****
      wxClassInfo*     classInfo;      // Pointer to the wxClassInfo associated with this class or NULL.
      int*             wxluatype;      // wxLua class type for userdata
!     const char*      baseclassName;  // Name of base class, or NULL if none.
!     wxLuaBindClass*  baseclass;      // Pointer to the base class or NULL for none.
                                       // This member is set after all the bindings are
                                       // registered since the base class may be from
!                                      // a different module (a library perhaps).
  
      wxLuaBindNumber* enums;          // Class member enums or NULL if none
--- 229,242 ----
      wxClassInfo*     classInfo;      // Pointer to the wxClassInfo associated with this class or NULL.
      int*             wxluatype;      // wxLua class type for userdata
!     const char**     baseclassNames; // Names of base classes, or NULL if no base classes.
!                                      // This is a NULL terminated array of strings.
!     wxLuaBindClass** baseBindClasses;// Pointers to the base classes or NULL for no base classes.
                                       // This member is set after all the bindings are
                                       // registered since the base class may be from
!                                      // a different module and so it can't be set at compile time.
!                                      // This array is one shorter than the baseclassNames array
!                                      // and you should use it rather than this to check the length
!                                      // since any one of these may be NULL if the
!                                      // library or module with the base class is not loaded.
  
      wxLuaBindNumber* enums;          // Class member enums or NULL if none
***************
*** 589,592 ****
--- 601,607 ----
      //   returns NULL on failure.
      static const wxLuaBindClass* FindBindClass(int wxl_type);
+     // Get wxLuaBindClass that has this class name using wxLuaBindClass::name,
+     //   returns NULL on failure.
+     static const wxLuaBindClass* FindBindClass(const char* className);
      // Get the first wxLuaBindClass that has this particular wxLuaBindMethod
      //   returns NULL on failure.

[Wxlua-commit] wxLua/bindings/wxlua override.hpp, 1.22, 1.23 wxlua.i, 1.19, 1.20

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

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

Modified Files:
	override.hpp wxlua.i 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxlua.i	17 Mar 2008 03:05:01 -0000	1.19
--- wxlua.i	14 May 2009 05:06:21 -0000	1.20
***************
*** 70,78 ****
  
  // Add the userdata object to the list of objects that will be deleted when
! // it does out of scope and the Lua garbage collector runs.
  // %function bool gcobject(void* object)
  
  // Remove the userdata object from the list of objects that will be deleted when
! // it does out of scope and the Lua garbage collector runs.
  %function bool ungcobject(void* object)
  
--- 70,78 ----
  
  // Add the userdata object to the list of objects that will be deleted when
! // it goes out of scope and the Lua garbage collector runs.
  // %function bool gcobject(void* object)
  
  // Remove the userdata object from the list of objects that will be deleted when
! // it goes out of scope and the Lua garbage collector runs.
  %function bool ungcobject(void* object)
  
***************
*** 136,142 ****
  %function wxString type(void* object)
  
! // %override wString typename(int wxluaarg_tag)
! // Returns the wxLua tag name for both the predefined (negative) as well as the
! // binding class tag numbers.
  %function wxString typename(int wxluaarg_tag)
  
--- 136,141 ----
  %function wxString type(void* object)
  
! // %override wxString typename(int wxluaarg_tag)
! // Returns the wxLua name binding wxLua class type numbers.
  %function wxString typename(int wxluaarg_tag)
  
***************
*** 174,183 ****
      int GetFunctionCount
  
!     {wxLuaBindClass*}            GetClassArray
!     {wxLuaBindMethod*}           GetFunctionArray
!     {name, value}                GetNumberArray
!     {name, value}                GetStringArray
!     {name, eventType, wxluatype} GetEventArray
!     {name, object, wxluatype}    GetObjectArray
  
  %endclass
--- 173,182 ----
      int GetFunctionCount
  
!     {wxLuaBindClass*}                            GetClassArray
!     {wxLuaBindMethod*}                           GetFunctionArray
!     {name, value}                                GetNumberArray
!     {name, value}                                GetStringArray
!     {name, eventType, wxluatype, wxLuaBindClass} GetEventArray
!     {name, object, wxluatype, wxLuaBindClass}    GetObjectArray
  
  %endclass
***************
*** 191,196 ****
      wxClassInfo*        classInfo
      int                 wxluatype
!     wxString            baseclassName
!     wxLuaBindClass*     baseclass
      {name, value}       enums
      int                 enums_n
--- 190,195 ----
      wxClassInfo*        classInfo
      int                 wxluatype
!     {wxString}          baseclassNames
!     {wxLuaBindClass*}   baseBindClasses
      {name, value}       enums
      int                 enums_n

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** override.hpp	26 Mar 2008 05:01:29 -0000	1.22
--- override.hpp	14 May 2009 05:06:21 -0000	1.23
***************
*** 175,181 ****
      if (!wxlua_iswxluatype(l_type, WXLUA_TUSERDATA))
          wxlua_argerror(L, 1, wxT("a 'userdata'"));
!     
      void* o = wxlua_touserdata(L, 1, false);
!     
      if (wxluaO_isgcobject(L, o))
      {
--- 175,181 ----
      if (!wxlua_iswxluatype(l_type, WXLUA_TUSERDATA))
          wxlua_argerror(L, 1, wxT("a 'userdata'"));
! 
      void* o = wxlua_touserdata(L, 1, false);
! 
      if (wxluaO_isgcobject(L, o))
      {
***************
*** 525,545 ****
              return 1;
          }
!         else if (strcmp(idx_str, "baseclassName") == 0)
          {
!             lua_pushstring(L, wxlClass->baseclassName);
!             return 1;
          }
!         else if (strcmp(idx_str, "baseclass") == 0)
          {
!             if (wxlClass->baseclass)
              {
!                 const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
!                 *ptr = wxlClass->baseclass;
!                     lua_newtable(L);
!                     lua_pushstring(L, "__index");
!                     lua_pushlightuserdata(L, wxlBinding);
!                     lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
!                     lua_rawset(L, -3);
!                     lua_setmetatable(L, -2);
  
                  return 1;
--- 525,568 ----
              return 1;
          }
!         else if (strcmp(idx_str, "baseclassNames") == 0)
          {
!             if (wxlClass->baseclassNames)
!             {
!                 lua_newtable(L);
!                 for (size_t i = 0; wxlClass->baseclassNames[i]; ++i)
!                 {
!                     lua_pushstring(L, wxlClass->baseclassNames[i]);
!                     lua_rawseti(L, -2, i + 1);
!                 }
!                 return 1;
!             }
! 
!             return 0;
          }
!         else if (strcmp(idx_str, "baseBindClasses") == 0)
          {
!             if (wxlClass->baseBindClasses)
              {
!                 lua_newtable(L);
!                 for (size_t i = 0; wxlClass->baseclassNames[i]; ++i) // use names to check for terminating NULL
!                 {
!                     if (wxlClass->baseBindClasses[i] == NULL) // may be NULL if not loaded
!                     {
!                         lua_pushnil(L);
!                     }
!                     else
!                     {
!                         const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
!                         *ptr = wxlClass->baseBindClasses[i];
!                             lua_newtable(L);
!                             lua_pushstring(L, "__index");
!                             lua_pushlightuserdata(L, wxlBinding);
!                             lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
!                             lua_rawset(L, -3);
!                             lua_setmetatable(L, -2);
!                     }
! 
!                     lua_rawseti(L, -2, i + 1);
!                 }
  
                  return 1;
***************
*** 754,757 ****
--- 777,799 ----
                  lua_rawset(L, -3);
  
+                 lua_pushstring(L, "wxLuaBindClass");
+                 const wxLuaBindClass* wxlClass = wxlBinding->GetBindClass(*wxlEvent->wxluatype);
+                 if (wxlClass == NULL)
+                 {
+                     lua_pushnil(L);
+                 }
+                 else
+                 {
+                     const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
+                     *ptr = wxlClass;
+                         lua_newtable(L);
+                         lua_pushstring(L, "__index");
+                         lua_pushlightuserdata(L, wxlBinding);
+                         lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
+                         lua_rawset(L, -3);
+                         lua_setmetatable(L, -2);
+                 }
+                 lua_rawset(L, -3);
+ 
                  lua_rawseti(L, -2, idx + 1);
              }
***************
*** 784,787 ****
--- 826,848 ----
                  lua_rawset(L, -3);
  
+                 lua_pushstring(L, "wxLuaBindClass");
+                 const wxLuaBindClass* wxlClass = wxlBinding->GetBindClass(*wxlObject->wxluatype);
+                 if (wxlClass == NULL)
+                 {
+                     lua_pushnil(L);
+                 }
+                 else
+                 {
+                     const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
+                     *ptr = wxlClass;
+                         lua_newtable(L);
+                         lua_pushstring(L, "__index");
+                         lua_pushlightuserdata(L, wxlBinding);
+                         lua_pushcclosure(L, wxluabind_wxLuaBindClass__index, 1); // push func with tag as upvalue
+                         lua_rawset(L, -3);
+                         lua_setmetatable(L, -2);
+                 }
+                 lua_rawset(L, -3);
+ 
                  lua_rawseti(L, -2, idx + 1);
              }

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

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Allow multiple inheritance in the bindings.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** genwxbind.lua	31 Mar 2009 04:23:42 -0000	1.178
--- genwxbind.lua	14 May 2009 05:06:21 -0000	1.179
***************
*** 194,205 ****
      dataTypeTable[name] =
      {
!         Name      = name,       -- typename, eg. void, bool, wxInt32
!         ValueType = value_type, -- "number", "enum", "class", "special" (special handling)
!                                 -- determines how to handle the data type
!         BaseClass = nil,        -- the BaseClass of this, if this is a class
!         IsNumber  = is_number,  -- can this data type be stored as a double (Lua's number type)
!         Abstract  = abstract,
!         Condition = nil,        -- conditions for this data type, eg. wxLUA_USE_xxx
!         ["%encapsulate"] = nil, -- Non wxObject derived class
      }
  end
--- 194,205 ----
      dataTypeTable[name] =
      {
!         Name        = name,       -- typename, eg. void, bool, wxInt32
!         ValueType   = value_type, -- "number", "enum", "class", "special" (special handling)
!                                   -- determines how to handle the data type
!         BaseClasses = nil,        -- the BaseClass of this, if this is a class
!         IsNumber    = is_number,  -- can this data type be stored as a double (Lua's number type)
!         Abstract    = abstract,
!         Condition   = nil,        -- conditions for this data type, eg. wxLUA_USE_xxx
!         ["%encapsulate"] = nil,   -- Non wxObject derived class
      }
  end
***************
*** 473,479 ****
      end
  
!     if dataTypeTable[classname].BaseClass then
!         local c = dataTypeTable[dataTypeTable[classname].BaseClass].Name
!         return IsDerivedClass(c, base_classname)
      end
  
--- 473,483 ----
      end
  
!     if dataTypeTable[classname].BaseClasses then
!         for _, c in ipairs(dataTypeTable[classname].BaseClasses) do
!             local c_name = dataTypeTable[c].Name
!             if IsDerivedClass(c_name, base_classname) then
!                 return true
!             end
!         end
      end
  
***************
*** 1768,1775 ****
  
                      -- set class's BaseClass
!                     if not dataTypeTable[classname].BaseClass then
!                         dataTypeTable[classname].BaseClass = tag
                      end
  
                      action = "find_classcomma"
                  elseif action == "find_structname" then
--- 1772,1781 ----
  
                      -- set class's BaseClass
!                     if not dataTypeTable[classname].BaseClasses then
!                         dataTypeTable[classname].BaseClasses = {}
                      end
  
+                     table.insert(dataTypeTable[classname].BaseClasses, tag)
+ 
                      action = "find_classcomma"
                  elseif action == "find_structname" then
***************
*** 4057,4063 ****
  
              -- Class Binding
!             local baseclass = "NULL"
!             if dataTypeTable[parseObject.Name].BaseClass then
!                 baseclass = "\""..dataTypeTable[parseObject.Name].BaseClass.."\""
              end
  
--- 4063,4071 ----
  
              -- Class Binding
!             local baseclassNames = "NULL"
!             local baseclassBinds = "NULL"
!             if dataTypeTable[parseObject.Name].BaseClasses then
!                 baseclassNames = "wxluabaseclassnames_"..MakeVar(parseObject.Name)
!                 baseclassBinds = "wxluabaseclassbinds_"..MakeVar(parseObject.Name)
              end
  
***************
*** 4122,4135 ****
              {
                  LuaName = MakeVar(parseObject.Name),
!                 Map = "    { \""..MakeVar(parseObject.Name).."\", "
                                  ..MakeVar(parseObject.Name).."_methods, "
                                  ..MakeVar(parseObject.Name).."_methodCount, "
                                  ..classinfo..", "
                                  .."&wxluatype_"..MakeClassVar(parseObject.Name)..", "
!                                 ..MakeVar(baseclass)..", "
!                                 .."NULL ,"
                                  ..enumArrayName..", "
                                  ..enumArrayCountName..", "
                                  .."}, \n",
                  Condition = classcondition
              }
--- 4130,4144 ----
              {
                  LuaName = MakeVar(parseObject.Name),
!                 Map = "    { wxluaclassname_"..MakeVar(parseObject.Name)..", "
                                  ..MakeVar(parseObject.Name).."_methods, "
                                  ..MakeVar(parseObject.Name).."_methodCount, "
                                  ..classinfo..", "
                                  .."&wxluatype_"..MakeClassVar(parseObject.Name)..", "
!                                 ..baseclassNames..", "
!                                 ..baseclassBinds..", "
                                  ..enumArrayName..", "
                                  ..enumArrayCountName..", "
                                  .."}, \n",
+                 BaseClasses = dataTypeTable[parseObject.Name].BaseClasses,
                  Condition = classcondition
              }
***************
*** 4440,4451 ****
      table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
-     table.insert(fileData, "wxLuaBindClass* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
-     table.insert(fileData, "    static wxLuaBindClass classList[] =\n    {\n")
- 
      local namedBindingTable = {}
      GenerateLuaNameFromIndexedTable(classBindingTable, namedBindingTable)
  
      -- sort the bindings by class name and write them out alphabetically
-     local sortedBindings = TableSort(namedBindingTable)
      GenerateMap(fileData, sortedBindings, "    ")
  
--- 4449,4498 ----
      table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      local namedBindingTable = {}
      GenerateLuaNameFromIndexedTable(classBindingTable, namedBindingTable)
+     local sortedBindings = TableSort(namedBindingTable)
+ 
+     -- Gather up all of the classnames
+     local classNames = {}
+ 
+     for n = 1, #sortedBindings do
+         for i = 1, #sortedBindings[n] do
+             classNames[sortedBindings[n][i].LuaName] = sortedBindings[n][i].LuaName
+             for _, bc in ipairs(sortedBindings[n][i].BaseClasses or {}) do
+                 classNames[bc] = bc
+             end
+         end
+     end
+ 
+     classNames = TableSort(classNames)
+ 
+     for _, c in pairs(classNames) do
+         table.insert(fileData, "static const char* wxluaclassname_"..c.." = \""..c.."\";\n")
+     end
+ 
+     table.insert(fileData, "\n")
+ 
+     for n = 1, #sortedBindings do
+         for i = 1, #sortedBindings[n] do
+             if sortedBindings[n][i].BaseClasses then
+                 local bc_n = 0
+                 local s = "static const char* wxluabaseclassnames_"..sortedBindings[n][i].LuaName.."[] = {"
+                 for _, bc in ipairs(sortedBindings[n][i].BaseClasses) do
+                     s = s.." wxluaclassname_"..bc..","
+                     bc_n = bc_n + 1
+                 end
+ 
+                 table.insert(fileData, s.." NULL };\n")
+                 table.insert(fileData, "static wxLuaBindClass* wxluabaseclassbinds_"..sortedBindings[n][i].LuaName.."[] = { "..string.sub(string.rep("NULL, ", bc_n), 1, -3).." };\n")
+             end
+         end
+     end
+ 
+     table.insert(fileData, "\n\n")
+ 
+     table.insert(fileData, "wxLuaBindClass* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
+     table.insert(fileData, "    static wxLuaBindClass classList[] =\n    {\n")
  
      -- sort the bindings by class name and write them out alphabetically
      GenerateMap(fileData, sortedBindings, "    ")
  

[Wxlua-commit] wxLua/build/msw nmake_wxLua.bat,NONE,1.1

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

Update of /cvsroot/wxlua/wxLua/build/msw
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31929/msw

Added Files:
	nmake_wxLua.bat 
Log Message:
Add a DOS batch script to use nmake to build and copy files for a release.


--- NEW FILE: nmake_wxLua.bat ---

@ECHO OFF
ECHO This builds wxLua using VC6's nmake.exe
ECHO Usage: nmake_wxLua.bat [BUILD_TYPE] [RELEASE_DIR]
ECHO   BUILD_TYPE  = release_lib, debug_lib, release_dll, debug_dll, clean, skip
ECHO   RELEASE_DIR = directory name to create and copy the appropriate files
ECHO                 into for creating a release.
ECHO You can only build one at a time since the EXEs replace each other,
ECHO   be sure to run "nmake_wxLua.bat clean" between builds.
ECHO To create a release, first run with the desired build, verify success,
ECHO   then run again with "skip RELEASE_DIR" to have the files copied.
ECHO.
PAUSE

REM -------------------------------------------------------------------------

@ECHO ON
REM CALL "C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT"
rem CALL "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
@ECHO OFF

ECHO.
REM -------------------------------------------------------------------------

IF %1 == clean (
  ECHO "== CLEAN ============================================================="
  nmake -f makefile.vc BUILD=release SHARED=0 WX_SHARED=0 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 clean
  nmake -f makefile.vc BUILD=debug SHARED=0 WX_SHARED=0 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 clean
  nmake -f makefile.vc BUILD=release SHARED=1 WX_SHARED=1 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 MONOLITHIC=1 WX_MONOLITHIC=1 MONOLITHIC_LUAMODULE=1 clean
  nmake -f makefile.vc BUILD=debug SHARED=1 WX_SHARED=1 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 MONOLITHIC=1 WX_MONOLITHIC=1 MONOLITHIC_LUAMODULE=1 clean
) ELSE IF %1 == release_lib (
  ECHO "== RELEASE LIB ======================================================="
  nmake -f makefile.vc BUILD=release SHARED=0 WX_SHARED=0 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 
) ELSE IF %1 == debug_lib (
  ECHO "== DEBUG LIB ========================================================="
  nmake -f makefile.vc BUILD=debug SHARED=0 WX_SHARED=0 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 
) ELSE IF %1 == release_dll (
  ECHO "== RELEASE DLL ======================================================="
  nmake -f makefile.vc BUILD=release SHARED=1 WX_SHARED=1 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 MONOLITHIC=1 WX_MONOLITHIC=1 MONOLITHIC_LUAMODULE=1
) ELSE IF %1 == debug_dll (
  ECHO "== DEBUG DLL ========================================================="
  nmake -f makefile.vc BUILD=debug SHARED=1 WX_SHARED=1 USE_WXBINDRICHTEXT=1 USE_WXLUAEDITAPP=1 MONOLITHIC=1 WX_MONOLITHIC=1 MONOLITHIC_LUAMODULE=1 
) ELSE IF %1 == skip (
  ECHO SKIPPING BUILD
) ELSE (
  ECHO UNKNOWN OPTION - NOTHING DONE.
)

ECHO.
REM -------------------------------------------------------------------------

IF [%2] == [] (
  ECHO NOT CREATING RELEASE_DIR
) ELSE (
  ECHO "== CREATING RELEASE INTO DIRECTORY %2"
  mkdir %2
  mkdir %2\bin
  mkdir %2\docs
  mkdir %2\samples
  mkdir %2\samples\image
  mkdir %2\apps
  mkdir %2\apps\wxluafreeze
  mkdir %2\apps\wxluacan

  
  REM This dir should be empty for release_dll since you should have run "clean"
  copy /Y ..\..\bin\vc_lib\*.exe %2\bin

  REM This dir should be empty for release_lib since you should have run "clean"
  copy /Y ..\..\bin\vc_dll\*.exe %2\bin
  copy /Y ..\..\lib\vc_dll\*.dll %2\bin
  
  copy /Y ..\..\docs\*.* %2\docs
  
  copy /Y ..\..\samples\*.*       %2\samples
  copy /Y ..\..\samples\image\*.* %2\samples\image

  copy /Y ..\..\apps\wxluafreeze\src\readme.txt      %2\apps\wxluafreeze
  copy /Y ..\..\apps\wxluafreeze\src\wxluafreeze.lua %2\apps\wxluafreeze
  copy /Y ..\..\apps\wxluacan\scripts\incircles.lua  %2\apps\wxluacan
  
  ECHO.
  ECHO If creating a DLL release, don't forget to copy the wxWidgets DLLS
  ECHO and the wxStEdit DLL.
)

[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp, 1.17, 1.18 wxaui_bind.cpp, 1.14, 1.15 wxbase_bind.cpp, 1.16, 1.17 wxbase_data.cpp, 1.18, 1.19 wxbase_file.cpp, 1.16, 1.17 wxcore_controls.cpp, 1.18, 1.19 wxcore_gdi.cpp, 1.21, 1.22 wxcore_image.cpp, 1.17, 1.18 wxcore_picker.cpp, 1.12, 1.13 wxcore_windows.cpp, 1.17, 1.18 wxhtml_bind.cpp, 1.11, 1.12 wxnet_bind.cpp, 1.12, 1.13 wxstc_bind.cpp, 1.12, 1.13

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

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

Modified Files:
	wxadv_bind.cpp wxaui_bind.cpp wxbase_bind.cpp wxbase_data.cpp 
	wxbase_file.cpp wxcore_controls.cpp wxcore_gdi.cpp 
	wxcore_image.cpp wxcore_picker.cpp wxcore_windows.cpp 
	wxhtml_bind.cpp wxnet_bind.cpp wxstc_bind.cpp 
Log Message:
Fix last commit to really use the wxlua_getenumtype() and wxlua_getuintegertype() functions.


Index: wxbase_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxbase_bind.cpp	24 Mar 2009 04:15:13 -0000	1.16
--- wxbase_bind.cpp	31 Mar 2009 04:23:42 -0000	1.17
***************
*** 1672,1681 ****
  
  #if wxCHECK_VERSION(2,6,0)
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxMicroSleep[] = { &wxluatype_TNUMBER, NULL };
  // %wxchkver_2_6 %function void wxMicroSleep(unsigned long microseconds)
  static int LUACALL wxLua_function_wxMicroSleep(lua_State *L)
  {
      // unsigned long microseconds
!     unsigned long microseconds = (long)wxlua_getnumbertype(L, 1);
      // call wxMicroSleep
      wxMicroSleep(microseconds);
--- 1672,1681 ----
  
  #if wxCHECK_VERSION(2,6,0)
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxMicroSleep[] = { &wxluatype_TINTEGER, NULL };
  // %wxchkver_2_6 %function void wxMicroSleep(unsigned long microseconds)
  static int LUACALL wxLua_function_wxMicroSleep(lua_State *L)
  {
      // unsigned long microseconds
!     unsigned long microseconds = (unsigned long)wxlua_getuintegertype(L, 1);
      // call wxMicroSleep
      wxMicroSleep(microseconds);
***************
*** 1685,1694 ****
  static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxMicroSleep[1] = {{ wxLua_function_wxMicroSleep, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_wxMicroSleep }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxMilliSleep[] = { &wxluatype_TNUMBER, NULL };
  // %wxchkver_2_6 %function void wxMilliSleep(unsigned long milliseconds)
  static int LUACALL wxLua_function_wxMilliSleep(lua_State *L)
  {
      // unsigned long milliseconds
!     unsigned long milliseconds = (long)wxlua_getnumbertype(L, 1);
      // call wxMilliSleep
      wxMilliSleep(milliseconds);
--- 1685,1694 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxMicroSleep[1] = {{ wxLua_function_wxMicroSleep, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_wxMicroSleep }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxMilliSleep[] = { &wxluatype_TINTEGER, NULL };
  // %wxchkver_2_6 %function void wxMilliSleep(unsigned long milliseconds)
  static int LUACALL wxLua_function_wxMilliSleep(lua_State *L)
  {
      // unsigned long milliseconds
!     unsigned long milliseconds = (unsigned long)wxlua_getuintegertype(L, 1);
      // call wxMilliSleep
      wxMilliSleep(milliseconds);
***************
*** 1935,1939 ****
  static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxSysErrorCode[1] = {{ wxLua_function_wxSysErrorCode, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxSysErrorMsg[] = { &wxluatype_TNUMBER, NULL };
  // %function wxString wxSysErrorMsg(unsigned long nErrCode = 0)
  static int LUACALL wxLua_function_wxSysErrorMsg(lua_State *L)
--- 1935,1939 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxSysErrorCode[1] = {{ wxLua_function_wxSysErrorCode, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxSysErrorMsg[] = { &wxluatype_TINTEGER, NULL };
  // %function wxString wxSysErrorMsg(unsigned long nErrCode = 0)
  static int LUACALL wxLua_function_wxSysErrorMsg(lua_State *L)
***************
*** 1942,1946 ****
      int argCount = lua_gettop(L);
      // unsigned long nErrCode = 0
!     unsigned long nErrCode = (argCount >= 1 ? (long)wxlua_getnumbertype(L, 1) : 0);
      // call wxSysErrorMsg
      wxString returns = (wxSysErrorMsg(nErrCode));
--- 1942,1946 ----
      int argCount = lua_gettop(L);
      // unsigned long nErrCode = 0
!     unsigned long nErrCode = (argCount >= 1 ? (unsigned long)wxlua_getuintegertype(L, 1) : 0);
      // call wxSysErrorMsg
      wxString returns = (wxSysErrorMsg(nErrCode));
***************
*** 1991,2000 ****
  
  #if !wxCHECK_VERSION(2,6,0)
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxUsleep[] = { &wxluatype_TNUMBER, NULL };
  // !%wxchkver_2_6 %function void wxUsleep(unsigned long milliseconds)
  static int LUACALL wxLua_function_wxUsleep(lua_State *L)
  {
      // unsigned long milliseconds
!     unsigned long milliseconds = (long)wxlua_getnumbertype(L, 1);
      // call wxUsleep
      wxUsleep(milliseconds);
--- 1991,2000 ----
  
  #if !wxCHECK_VERSION(2,6,0)
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxUsleep[] = { &wxluatype_TINTEGER, NULL };
  // !%wxchkver_2_6 %function void wxUsleep(unsigned long milliseconds)
  static int LUACALL wxLua_function_wxUsleep(lua_State *L)
  {
      // unsigned long milliseconds
!     unsigned long milliseconds = (unsigned long)wxlua_getuintegertype(L, 1);
      // call wxUsleep
      wxUsleep(milliseconds);

Index: wxnet_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxnet_bind.cpp	24 Mar 2009 04:15:31 -0000	1.12
--- wxnet_bind.cpp	31 Mar 2009 04:23:42 -0000	1.13
***************
*** 283,287 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Peek[] = { &wxluatype_wxSocketBase, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSocketBase_Peek(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Peek[1] = {{ wxLua_wxSocketBase_Peek, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSocketBase_Peek }};
--- 283,287 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Peek[] = { &wxluatype_wxSocketBase, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSocketBase_Peek(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Peek[1] = {{ wxLua_wxSocketBase_Peek, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSocketBase_Peek }};
***************
*** 309,313 ****
  
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Read[] = { &wxluatype_wxSocketBase, &wxluatype_TLIGHTUSERDATA, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSocketBase_Read(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Read[1] = {{ wxLua_wxSocketBase_Read, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSocketBase_Read }};
--- 309,313 ----
  
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Read[] = { &wxluatype_wxSocketBase, &wxluatype_TLIGHTUSERDATA, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSocketBase_Read(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Read[1] = {{ wxLua_wxSocketBase_Read, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSocketBase_Read }};
***************
*** 335,339 ****
  
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_ReadMsg[] = { &wxluatype_wxSocketBase, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSocketBase_ReadMsg(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_ReadMsg[1] = {{ wxLua_wxSocketBase_ReadMsg, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSocketBase_ReadMsg }};
--- 335,339 ----
  
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_ReadMsg[] = { &wxluatype_wxSocketBase, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSocketBase_ReadMsg(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_ReadMsg[1] = {{ wxLua_wxSocketBase_ReadMsg, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSocketBase_ReadMsg }};
***************
*** 473,477 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Unread[] = { &wxluatype_wxSocketBase, &wxluatype_TSTRING, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSocketBase_Unread(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Unread[1] = {{ wxLua_wxSocketBase_Unread, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSocketBase_Unread }};
--- 473,477 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Unread[] = { &wxluatype_wxSocketBase, &wxluatype_TSTRING, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSocketBase_Unread(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Unread[1] = {{ wxLua_wxSocketBase_Unread, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSocketBase_Unread }};
***************
*** 583,587 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Write[] = { &wxluatype_wxSocketBase, &wxluatype_TSTRING, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSocketBase_Write(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Write[1] = {{ wxLua_wxSocketBase_Write, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSocketBase_Write }};
--- 583,587 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSocketBase_Write[] = { &wxluatype_wxSocketBase, &wxluatype_TSTRING, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSocketBase_Write(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Write[1] = {{ wxLua_wxSocketBase_Write, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSocketBase_Write }};
***************
*** 1140,1144 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxIPaddress_Service1[] = { &wxluatype_wxIPaddress, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxIPaddress_Service1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_Service1[1] = {{ wxLua_wxIPaddress_Service1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxIPaddress_Service1 }};
--- 1140,1144 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxIPaddress_Service1[] = { &wxluatype_wxIPaddress, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxIPaddress_Service1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_Service1[1] = {{ wxLua_wxIPaddress_Service1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxIPaddress_Service1 }};
***************
*** 1147,1151 ****
  {
      // unsigned short service
!     unsigned short service = (short)wxlua_getnumbertype(L, 2);
      // get this
      wxIPaddress * self = (wxIPaddress *)wxluaT_getuserdatatype(L, 1, wxluatype_wxIPaddress);
--- 1147,1151 ----
  {
      // unsigned short service
!     unsigned short service = (unsigned short)wxlua_getuintegertype(L, 2);
      // get this
      wxIPaddress * self = (wxIPaddress *)wxluaT_getuserdatatype(L, 1, wxluatype_wxIPaddress);
***************
*** 1236,1240 ****
  int wxluatype_wxIPV4address = WXLUA_TUNKNOWN;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxIPV4address_Hostname[] = { &wxluatype_wxIPV4address, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxIPV4address_Hostname(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPV4address_Hostname[1] = {{ wxLua_wxIPV4address_Hostname, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxIPV4address_Hostname }};
--- 1236,1240 ----
  int wxluatype_wxIPV4address = WXLUA_TUNKNOWN;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxIPV4address_Hostname[] = { &wxluatype_wxIPV4address, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxIPV4address_Hostname(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPV4address_Hostname[1] = {{ wxLua_wxIPV4address_Hostname, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxIPV4address_Hostname }};
***************
*** 1243,1247 ****
  {
      // unsigned long addr
!     unsigned long addr = (long)wxlua_getnumbertype(L, 2);
      // get this
      wxIPV4address * self = (wxIPV4address *)wxluaT_getuserdatatype(L, 1, wxluatype_wxIPV4address);
--- 1243,1247 ----
  {
      // unsigned long addr
!     unsigned long addr = (unsigned long)wxlua_getuintegertype(L, 2);
      // get this
      wxIPV4address * self = (wxIPV4address *)wxluaT_getuserdatatype(L, 1, wxluatype_wxIPV4address);

Index: wxstc_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxstc_bind.cpp	24 Mar 2009 04:15:31 -0000	1.12
--- wxstc_bind.cpp	31 Mar 2009 04:23:42 -0000	1.13
***************
*** 4026,4030 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerNext[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_MarkerNext(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerNext[1] = {{ wxLua_wxStyledTextCtrl_MarkerNext, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerNext }};
--- 4026,4030 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerNext[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_MarkerNext(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerNext[1] = {{ wxLua_wxStyledTextCtrl_MarkerNext, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerNext }};
***************
*** 4033,4037 ****
  {
      // unsigned int markerMask
!     unsigned int markerMask = (int)wxlua_getnumbertype(L, 3);
      // int lineStart
      int lineStart = (int)wxlua_getnumbertype(L, 2);
--- 4033,4037 ----
  {
      // unsigned int markerMask
!     unsigned int markerMask = (unsigned int)wxlua_getuintegertype(L, 3);
      // int lineStart
      int lineStart = (int)wxlua_getnumbertype(L, 2);
***************
*** 4046,4050 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerPrevious[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_MarkerPrevious(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerPrevious[1] = {{ wxLua_wxStyledTextCtrl_MarkerPrevious, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerPrevious }};
--- 4046,4050 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerPrevious[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_MarkerPrevious(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_MarkerPrevious[1] = {{ wxLua_wxStyledTextCtrl_MarkerPrevious, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_MarkerPrevious }};
***************
*** 4053,4057 ****
  {
      // unsigned int markerMask
!     unsigned int markerMask = (int)wxlua_getnumbertype(L, 3);
      // int lineStart
      int lineStart = (int)wxlua_getnumbertype(L, 2);
--- 4053,4057 ----
  {
      // unsigned int markerMask
!     unsigned int markerMask = (unsigned int)wxlua_getuintegertype(L, 3);
      // int lineStart
      int lineStart = (int)wxlua_getnumbertype(L, 2);
***************
*** 5400,5404 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_SetMarginMask[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_SetMarginMask(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_SetMarginMask[1] = {{ wxLua_wxStyledTextCtrl_SetMarginMask, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_SetMarginMask }};
--- 5400,5404 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_SetMarginMask[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_SetMarginMask(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_SetMarginMask[1] = {{ wxLua_wxStyledTextCtrl_SetMarginMask, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_SetMarginMask }};
***************
*** 5407,5411 ****
  {
      // unsigned int mask
!     unsigned int mask = (int)wxlua_getnumbertype(L, 3);
      // int margin
      int margin = (int)wxlua_getnumbertype(L, 2);
--- 5407,5411 ----
  {
      // unsigned int mask
!     unsigned int mask = (unsigned int)wxlua_getuintegertype(L, 3);
      // int margin
      int margin = (int)wxlua_getnumbertype(L, 2);
***************
*** 6408,6412 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_StartStyling[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_StartStyling(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_StartStyling[1] = {{ wxLua_wxStyledTextCtrl_StartStyling, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_StartStyling }};
--- 6408,6412 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextCtrl_StartStyling[] = { &wxluatype_wxStyledTextCtrl, &wxluatype_TNUMBER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxStyledTextCtrl_StartStyling(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_StartStyling[1] = {{ wxLua_wxStyledTextCtrl_StartStyling, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxStyledTextCtrl_StartStyling }};
***************
*** 6415,6419 ****
  {
      // unsigned int mask
!     unsigned int mask = (int)wxlua_getnumbertype(L, 3);
      // int pos
      int pos = (int)wxlua_getnumbertype(L, 2);
--- 6415,6419 ----
  {
      // unsigned int mask
!     unsigned int mask = (unsigned int)wxlua_getuintegertype(L, 3);
      // int pos
      int pos = (int)wxlua_getnumbertype(L, 2);

Index: wxcore_windows.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_windows.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxcore_windows.cpp	24 Mar 2009 04:15:30 -0000	1.17
--- wxcore_windows.cpp	31 Mar 2009 04:23:42 -0000	1.18
***************
*** 5290,5294 ****
  
  #if (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBookCtrlBase_SetInternalBorder[] = { &wxluatype_wxBookCtrlBase, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxBookCtrlBase_SetInternalBorder(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxBookCtrlBase_SetInternalBorder[1] = {{ wxLua_wxBookCtrlBase_SetInternalBorder, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBookCtrlBase_SetInternalBorder }};
--- 5290,5294 ----
  
  #if (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBookCtrlBase_SetInternalBorder[] = { &wxluatype_wxBookCtrlBase, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxBookCtrlBase_SetInternalBorder(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxBookCtrlBase_SetInternalBorder[1] = {{ wxLua_wxBookCtrlBase_SetInternalBorder, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBookCtrlBase_SetInternalBorder }};
***************
*** 5297,5301 ****
  {
      // unsigned int border
!     unsigned int border = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxBookCtrlBase * self = (wxBookCtrlBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBookCtrlBase);
--- 5297,5301 ----
  {
      // unsigned int border
!     unsigned int border = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxBookCtrlBase * self = (wxBookCtrlBase *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBookCtrlBase);

Index: wxbase_data.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_data.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxbase_data.cpp	24 Mar 2009 04:15:14 -0000	1.18
--- wxbase_data.cpp	31 Mar 2009 04:23:42 -0000	1.19
***************
*** 2542,2546 ****
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxLongLong_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLongLong_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxLongLong_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxLongLong_constructor(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxLongLong_constructor[1] = {{ wxLua_wxLongLong_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxLongLong_constructor }};
--- 2542,2546 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxLongLong_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLongLong_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxLongLong_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxLongLong_constructor(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxLongLong_constructor[1] = {{ wxLua_wxLongLong_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxLongLong_constructor }};
***************
*** 2551,2555 ****
      int argCount = lua_gettop(L);
      // unsigned long lo = 0
!     unsigned long lo = (argCount >= 2 ? (long)wxlua_getnumbertype(L, 2) : 0);
      // long hi = 0
      long hi = (argCount >= 1 ? (long)wxlua_getnumbertype(L, 1) : 0);
--- 2551,2555 ----
      int argCount = lua_gettop(L);
      // unsigned long lo = 0
!     unsigned long lo = (argCount >= 2 ? (unsigned long)wxlua_getuintegertype(L, 2) : 0);
      // long hi = 0
      long hi = (argCount >= 1 ? (long)wxlua_getnumbertype(L, 1) : 0);
***************
*** 2662,2666 ****
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxULongLong_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxULongLong_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxULongLong_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxULongLong_constructor(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxULongLong_constructor[1] = {{ wxLua_wxULongLong_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxULongLong_constructor }};
--- 2662,2666 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxULongLong_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxULongLong_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxULongLong_constructor[] = { &wxluatype_TINTEGER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxULongLong_constructor(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxULongLong_constructor[1] = {{ wxLua_wxULongLong_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxULongLong_constructor }};
***************
*** 2671,2677 ****
      int argCount = lua_gettop(L);
      // unsigned long lo = 0
!     unsigned long lo = (argCount >= 2 ? (long)wxlua_getnumbertype(L, 2) : 0);
      // unsigned long hi = 0
!     unsigned long hi = (argCount >= 1 ? (long)wxlua_getnumbertype(L, 1) : 0);
      // call constructor
      wxULongLong* returns = new wxULongLong(hi, lo);
--- 2671,2677 ----
      int argCount = lua_gettop(L);
      // unsigned long lo = 0
!     unsigned long lo = (argCount >= 2 ? (unsigned long)wxlua_getuintegertype(L, 2) : 0);
      // unsigned long hi = 0
!     unsigned long hi = (argCount >= 1 ? (unsigned long)wxlua_getuintegertype(L, 1) : 0);
      // call constructor
      wxULongLong* returns = new wxULongLong(hi, lo);

Index: wxbase_file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_file.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxbase_file.cpp	24 Mar 2009 04:15:16 -0000	1.16
--- wxbase_file.cpp	31 Mar 2009 04:23:42 -0000	1.17
***************
*** 2809,2813 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxFile_Read[] = { &wxluatype_wxFile, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxFile_Read(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxFile_Read[1] = {{ wxLua_wxFile_Read, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxFile_Read }};
--- 2809,2813 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxFile_Read[] = { &wxluatype_wxFile, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxFile_Read(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxFile_Read[1] = {{ wxLua_wxFile_Read, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxFile_Read }};
***************
*** 2913,2917 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxFile_Write[] = { &wxluatype_wxFile, &wxluatype_TSTRING, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxFile_Write(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxFile_Write[1] = {{ wxLua_wxFile_Write, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxFile_Write }};
--- 2913,2917 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxFile_Write[] = { &wxluatype_wxFile, &wxluatype_TSTRING, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxFile_Write(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxFile_Write[1] = {{ wxLua_wxFile_Write, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxFile_Write }};

Index: wxadv_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxadv_bind.cpp	24 Mar 2009 04:15:11 -0000	1.17
--- wxadv_bind.cpp	31 Mar 2009 04:23:42 -0000	1.18
***************
*** 827,831 ****
  int wxluatype_wxAnimation = WXLUA_TUNKNOWN;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAnimation_GetDelay[] = { &wxluatype_wxAnimation, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAnimation_GetDelay(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_GetDelay[1] = {{ wxLua_wxAnimation_GetDelay, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAnimation_GetDelay }};
--- 827,831 ----
  int wxluatype_wxAnimation = WXLUA_TUNKNOWN;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAnimation_GetDelay[] = { &wxluatype_wxAnimation, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAnimation_GetDelay(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_GetDelay[1] = {{ wxLua_wxAnimation_GetDelay, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAnimation_GetDelay }};
***************
*** 834,838 ****
  {
      // unsigned int frame
!     unsigned int frame = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxAnimation * self = (wxAnimation *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAnimation);
--- 834,838 ----
  {
      // unsigned int frame
!     unsigned int frame = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxAnimation * self = (wxAnimation *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAnimation);
***************
*** 847,851 ****
  
  #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAnimation_GetFrame[] = { &wxluatype_wxAnimation, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_GetFrame[1] = {{ wxLua_wxAnimation_GetFrame, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAnimation_GetFrame }};
--- 847,851 ----
  
  #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAnimation_GetFrame[] = { &wxluatype_wxAnimation, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_GetFrame[1] = {{ wxLua_wxAnimation_GetFrame, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAnimation_GetFrame }};
***************
*** 854,858 ****
  {
      // unsigned int frame
!     unsigned int frame = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxAnimation * self = (wxAnimation *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAnimation);
--- 854,858 ----
  {
      // unsigned int frame
!     unsigned int frame = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxAnimation * self = (wxAnimation *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAnimation);
***************
*** 1526,1530 ****
  
  #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_GetItemBitmap(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_GetItemBitmap[1] = {{ wxLua_wxBitmapComboBox_GetItemBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap }};
--- 1526,1530 ----
  
  #if (wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxBitmap)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_GetItemBitmap(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_GetItemBitmap[1] = {{ wxLua_wxBitmapComboBox_GetItemBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmapComboBox_GetItemBitmap }};
***************
*** 1533,1537 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox);
--- 1533,1537 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox);
***************
*** 1547,1551 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TNUMBER, &wxluatype_wxClientData, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_Insert2(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert2[1] = {{ wxLua_wxBitmapComboBox_Insert2, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2 }};
--- 1547,1551 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TINTEGER, &wxluatype_wxClientData, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_Insert2(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert2[1] = {{ wxLua_wxBitmapComboBox_Insert2, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert2 }};
***************
*** 1556,1560 ****
      wxClientData * clientData = (wxClientData *)wxluaT_getuserdatatype(L, 5, wxluatype_wxClientData);
      // unsigned int pos
!     unsigned int pos = (int)wxlua_getnumbertype(L, 4);
      // const wxBitmap bitmap
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
--- 1556,1560 ----
      wxClientData * clientData = (wxClientData *)wxluaT_getuserdatatype(L, 5, wxluatype_wxClientData);
      // unsigned int pos
!     unsigned int pos = (unsigned int)wxlua_getuintegertype(L, 4);
      // const wxBitmap bitmap
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
***************
*** 1571,1575 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert1[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_Insert1(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert1[1] = {{ wxLua_wxBitmapComboBox_Insert1, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert1 }};
--- 1571,1575 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert1[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TINTEGER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_Insert1(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert1[1] = {{ wxLua_wxBitmapComboBox_Insert1, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert1 }};
***************
*** 1580,1584 ****
      long data = (long)wxlua_getnumbertype(L, 5);
      // unsigned int pos
!     unsigned int pos = (int)wxlua_getnumbertype(L, 4);
      // const wxBitmap bitmap
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
--- 1580,1584 ----
      long data = (long)wxlua_getnumbertype(L, 5);
      // unsigned int pos
!     unsigned int pos = (unsigned int)wxlua_getuintegertype(L, 4);
      // const wxBitmap bitmap
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
***************
*** 1595,1599 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_Insert(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert[1] = {{ wxLua_wxBitmapComboBox_Insert, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert }};
--- 1595,1599 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TSTRING, &wxluatype_wxBitmap, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_Insert(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Insert[1] = {{ wxLua_wxBitmapComboBox_Insert, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxBitmapComboBox_Insert }};
***************
*** 1602,1606 ****
  {
      // unsigned int pos
!     unsigned int pos = (int)wxlua_getnumbertype(L, 4);
      // const wxBitmap bitmap
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
--- 1602,1606 ----
  {
      // unsigned int pos
!     unsigned int pos = (unsigned int)wxlua_getuintegertype(L, 4);
      // const wxBitmap bitmap
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
***************
*** 1617,1621 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetItemBitmap[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TNUMBER, &wxluatype_wxBitmap, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_SetItemBitmap(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetItemBitmap[1] = {{ wxLua_wxBitmapComboBox_SetItemBitmap, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetItemBitmap }};
--- 1617,1621 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_SetItemBitmap[] = { &wxluatype_wxBitmapComboBox, &wxluatype_TINTEGER, &wxluatype_wxBitmap, NULL };
  static int LUACALL wxLua_wxBitmapComboBox_SetItemBitmap(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_SetItemBitmap[1] = {{ wxLua_wxBitmapComboBox_SetItemBitmap, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxBitmapComboBox_SetItemBitmap }};
***************
*** 1626,1630 ****
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox);
--- 1626,1630 ----
      const wxBitmap * bitmap = (const wxBitmap *)wxluaT_getuserdatatype(L, 3, wxluatype_wxBitmap);
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxBitmapComboBox * self = (wxBitmapComboBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxBitmapComboBox);
***************
*** 2860,2864 ****
  {
      // const wxDateTime::WeekDay wd
!     const wxDateTime::WeekDay wd = (wxDateTime::WeekDay)wxlua_getenumtype(L, 2);
      // get this
      wxCalendarEvent * self = (wxCalendarEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCalendarEvent);
--- 2860,2864 ----
  {
      // const wxDateTime::WeekDay wd
!     const wxDateTime::WeekDay wd = (const wxDateTime::WeekDay)wxlua_getenumtype(L, 2);
      // get this
      wxCalendarEvent * self = (wxCalendarEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCalendarEvent);
***************
*** 6585,6589 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSound_Play[] = { &wxluatype_wxSound, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSound_Play(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxSound_Play[1] = {{ wxLua_wxSound_Play, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxSound_Play }};
--- 6585,6589 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSound_Play[] = { &wxluatype_wxSound, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSound_Play(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxSound_Play[1] = {{ wxLua_wxSound_Play, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxSound_Play }};
***************
*** 6594,6598 ****
      int argCount = lua_gettop(L);
      // unsigned int flags = wxSOUND_ASYNC
!     unsigned int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxSOUND_ASYNC);
      // get this
      wxSound * self = (wxSound *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSound);
--- 6594,6598 ----
      int argCount = lua_gettop(L);
      // unsigned int flags = wxSOUND_ASYNC
!     unsigned int flags = (argCount >= 2 ? (unsigned int)wxlua_getuintegertype(L, 2) : wxSOUND_ASYNC);
      // get this
      wxSound * self = (wxSound *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSound);
***************
*** 6754,6758 ****
  
  #if (wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE))
! static wxLuaArgType s_wxluatypeArray_wxLua_wxWave_Play1[] = { &wxluatype_wxWave, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxWave_Play1(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxWave_Play1[1] = {{ wxLua_wxWave_Play1, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxWave_Play1 }};
--- 6754,6758 ----
  
  #if (wxCHECK_VERSION(2,6,0)) && ((wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE))
! static wxLuaArgType s_wxluatypeArray_wxLua_wxWave_Play1[] = { &wxluatype_wxWave, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxWave_Play1(lua_State *L);
  // // static wxLuaBindCFunc s_wxluafunc_wxLua_wxWave_Play1[1] = {{ wxLua_wxWave_Play1, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxWave_Play1 }};
***************
*** 6763,6767 ****
      int argCount = lua_gettop(L);
      // unsigned int flags = wxSOUND_ASYNC
!     unsigned int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxSOUND_ASYNC);
      // get this
      wxWave * self = (wxWave *)wxluaT_getuserdatatype(L, 1, wxluatype_wxWave);
--- 6763,6767 ----
      int argCount = lua_gettop(L);
      // unsigned int flags = wxSOUND_ASYNC
!     unsigned int flags = (argCount >= 2 ? (unsigned int)wxlua_getuintegertype(L, 2) : wxSOUND_ASYNC);
      // get this
      wxWave * self = (wxWave *)wxluaT_getuserdatatype(L, 1, wxluatype_wxWave);

Index: wxhtml_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_bind.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxhtml_bind.cpp	24 Mar 2009 04:15:31 -0000	1.11
--- wxhtml_bind.cpp	31 Mar 2009 04:23:42 -0000	1.12
***************
*** 3435,3439 ****
  #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_Delete[] = { &wxluatype_wxSimpleHtmlListBox, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSimpleHtmlListBox_Delete(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHtmlListBox_Delete[1] = {{ wxLua_wxSimpleHtmlListBox_Delete, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_Delete }};
--- 3435,3439 ----
  #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && ((wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_Delete[] = { &wxluatype_wxSimpleHtmlListBox, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSimpleHtmlListBox_Delete(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHtmlListBox_Delete[1] = {{ wxLua_wxSimpleHtmlListBox_Delete, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_Delete }};
***************
*** 3442,3446 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSimpleHtmlListBox);
--- 3442,3446 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSimpleHtmlListBox);
***************
*** 3483,3487 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_GetString[] = { &wxluatype_wxSimpleHtmlListBox, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxSimpleHtmlListBox_GetString(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHtmlListBox_GetString[1] = {{ wxLua_wxSimpleHtmlListBox_GetString, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_GetString }};
--- 3483,3487 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_GetString[] = { &wxluatype_wxSimpleHtmlListBox, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxSimpleHtmlListBox_GetString(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHtmlListBox_GetString[1] = {{ wxLua_wxSimpleHtmlListBox_GetString, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_GetString }};
***************
*** 3490,3494 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSimpleHtmlListBox);
--- 3490,3494 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSimpleHtmlListBox);
***************
*** 3540,3544 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_SetString[] = { &wxluatype_wxSimpleHtmlListBox, &wxluatype_TNUMBER, &wxluatype_TSTRING, NULL };
  static int LUACALL wxLua_wxSimpleHtmlListBox_SetString(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHtmlListBox_SetString[1] = {{ wxLua_wxSimpleHtmlListBox_SetString, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_SetString }};
--- 3540,3544 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_SetString[] = { &wxluatype_wxSimpleHtmlListBox, &wxluatype_TINTEGER, &wxluatype_TSTRING, NULL };
  static int LUACALL wxLua_wxSimpleHtmlListBox_SetString(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHtmlListBox_SetString[1] = {{ wxLua_wxSimpleHtmlListBox_SetString, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxSimpleHtmlListBox_SetString }};
***************
*** 3549,3553 ****
      const wxString s = wxlua_getwxStringtype(L, 3);
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSimpleHtmlListBox);
--- 3549,3553 ----
      const wxString s = wxlua_getwxStringtype(L, 3);
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxSimpleHtmlListBox * self = (wxSimpleHtmlListBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSimpleHtmlListBox);
***************
*** 4482,4486 ****
  {
      // const int id
!     const int id = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxHtmlHelpController * self = (wxHtmlHelpController *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlHelpController);
--- 4482,4486 ----
  {
      // const int id
!     const int id = (const int)wxlua_getnumbertype(L, 2);
      // get this
      wxHtmlHelpController * self = (wxHtmlHelpController *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHtmlHelpController);

Index: wxcore_controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxcore_controls.cpp	24 Mar 2009 04:15:20 -0000	1.18
--- wxcore_controls.cpp	31 Mar 2009 04:23:42 -0000	1.19
***************
*** 846,850 ****
  {
      // const wxCheckBoxState state
!     const wxCheckBoxState state = (wxCheckBoxState)wxlua_getenumtype(L, 2);
      // get this
      wxCheckBox * self = (wxCheckBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCheckBox);
--- 846,850 ----
  {
      // const wxCheckBoxState state
!     const wxCheckBoxState state = (const wxCheckBoxState)wxlua_getenumtype(L, 2);
      // get this
      wxCheckBox * self = (wxCheckBox *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCheckBox);
***************
*** 1066,1070 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_Delete[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_Delete(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_Delete[1] = {{ wxLua_wxControlWithItems_Delete, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_Delete }};
--- 1066,1070 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_Delete[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxControlWithItems_Delete(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_Delete[1] = {{ wxLua_wxControlWithItems_Delete, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_Delete }};
***************
*** 1073,1077 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
--- 1073,1077 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
***************
*** 1100,1104 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetClientData[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetClientData(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetClientData[1] = {{ wxLua_wxControlWithItems_GetClientData, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetClientData }};
--- 1100,1104 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetClientData[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetClientData(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetClientData[1] = {{ wxLua_wxControlWithItems_GetClientData, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetClientData }};
***************
*** 1107,1111 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
--- 1107,1111 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
***************
*** 1118,1122 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetClientObject[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetClientObject(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetClientObject[1] = {{ wxLua_wxControlWithItems_GetClientObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetClientObject }};
--- 1118,1122 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetClientObject[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetClientObject(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetClientObject[1] = {{ wxLua_wxControlWithItems_GetClientObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetClientObject }};
***************
*** 1125,1129 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
--- 1125,1129 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
***************
*** 1168,1172 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetString[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetString(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetString[1] = {{ wxLua_wxControlWithItems_GetString, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetString }};
--- 1168,1172 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetString[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetString(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetString[1] = {{ wxLua_wxControlWithItems_GetString, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetString }};
***************
*** 1175,1179 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
--- 1175,1179 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
***************
*** 1186,1190 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetStringClientObject[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetStringClientObject[1] = {{ wxLua_wxControlWithItems_GetStringClientObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetStringClientObject }};
--- 1186,1190 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_GetStringClientObject[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_GetStringClientObject[1] = {{ wxLua_wxControlWithItems_GetStringClientObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_GetStringClientObject }};
***************
*** 1193,1197 ****
  {
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
--- 1193,1197 ----
  {
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
***************
*** 1220,1224 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_Insert2[] = { &wxluatype_wxControlWithItems, &wxluatype_TSTRING, &wxluatype_TNUMBER, &wxluatype_wxClientData, NULL };
  static int LUACALL wxLua_wxControlWithItems_Insert2(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_Insert2[1] = {{ wxLua_wxControlWithItems_Insert2, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxControlWithItems_Insert2 }};
--- 1220,1224 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_Insert2[] = { &wxluatype_wxControlWithItems, &wxluatype_TSTRING, &wxluatype_TINTEGER, &wxluatype_wxClientData, NULL };
  static int LUACALL wxLua_wxControlWithItems_Insert2(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_Insert2[1] = {{ wxLua_wxControlWithItems_Insert2, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxControlWithItems_Insert2 }};
***************
*** 1229,1233 ****
      wxClientData * clientData = (wxClientData *)wxluaT_getuserdatatype(L, 4, wxluatype_wxClientData);
      // unsigned int pos
!     unsigned int pos = (int)wxlua_getnumbertype(L, 3);
      // const wxString item
      const wxString item = wxlua_getwxStringtype(L, 2);
--- 1229,1233 ----
      wxClientData * clientData = (wxClientData *)wxluaT_getuserdatatype(L, 4, wxluatype_wxClientData);
      // unsigned int pos
!     unsigned int pos = (unsigned int)wxlua_getuintegertype(L, 3);
      // const wxString item
      const wxString item = wxlua_getwxStringtype(L, 2);
***************
*** 1242,1246 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_Insert1[] = { &wxluatype_wxControlWithItems, &wxluatype_TSTRING, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_Insert1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_Insert1[1] = {{ wxLua_wxControlWithItems_Insert1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxControlWithItems_Insert1 }};
--- 1242,1246 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_Insert1[] = { &wxluatype_wxControlWithItems, &wxluatype_TSTRING, &wxluatype_TINTEGER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_Insert1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_Insert1[1] = {{ wxLua_wxControlWithItems_Insert1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxControlWithItems_Insert1 }};
***************
*** 1251,1255 ****
      long number = (long)wxlua_getnumbertype(L, 4);
      // unsigned int pos
!     unsigned int pos = (int)wxlua_getnumbertype(L, 3);
      // const wxString item
      const wxString item = wxlua_getwxStringtype(L, 2);
--- 1251,1255 ----
      long number = (long)wxlua_getnumbertype(L, 4);
      // unsigned int pos
!     unsigned int pos = (unsigned int)wxlua_getuintegertype(L, 3);
      // const wxString item
      const wxString item = wxlua_getwxStringtype(L, 2);
***************
*** 1316,1320 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_SetClientData[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_SetClientData(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_SetClientData[1] = {{ wxLua_wxControlWithItems_SetClientData, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxControlWithItems_SetClientData }};
--- 1316,1320 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_SetClientData[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_SetClientData(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_SetClientData[1] = {{ wxLua_wxControlWithItems_SetClientData, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxControlWithItems_SetClientData }};
***************
*** 1325,1329 ****
      long number = (long)wxlua_getnumbertype(L, 3);
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
--- 1325,1329 ----
      long number = (long)wxlua_getnumbertype(L, 3);
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
***************
*** 1334,1338 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_SetClientObject[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, &wxluatype_wxClientData, NULL };
  static int LUACALL wxLua_wxControlWithItems_SetClientObject(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_SetClientObject[1] = {{ wxLua_wxControlWithItems_SetClientObject, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxControlWithItems_SetClientObject }};
--- 1334,1338 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_SetClientObject[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, &wxluatype_wxClientData, NULL };
  static int LUACALL wxLua_wxControlWithItems_SetClientObject(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_SetClientObject[1] = {{ wxLua_wxControlWithItems_SetClientObject, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxControlWithItems_SetClientObject }};
***************
*** 1343,1347 ****
      wxClientData * data = (wxClientData *)wxluaT_getuserdatatype(L, 3, wxluatype_wxClientData);
      // unsigned int n
!     unsigned int n = (int)wxlua_getnumbertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
--- 1343,1347 ----
      wxClientData * data = (wxClientData *)wxluaT_getuserdatatype(L, 3, wxluatype_wxClientData);
      // unsigned int n
!     unsigned int n = (unsigned int)wxlua_getuintegertype(L, 2);
      // get this
      wxControlWithItems * self = (wxControlWithItems *)wxluaT_getuserdatatype(L, 1, wxluatype_wxControlWithItems);
***************
*** 1352,1356 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_SetSelection[] = { &wxluatype_wxControlWithItems, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxControlWithItems_SetSelection(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_SetSelection[1] = {{ wxLua_wxControlWithItems_SetSelection, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_SetSelection }};
--- 1352,1356 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxControlWithItems_SetSelection[] = { &wxluatype_wxControlWithItems, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxControlWithItems_SetSelection(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxControlWithItems_SetSelection[1] = {{ wxLua_wxControlWithItems_SetSelection, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxControlWithItems_SetSelection }};
*************...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxbind/include wxadv_bind.h, 1.17, 1.18 wxaui_bind.h, 1.16, 1.17 wxbase_bind.h, 1.16, 1.17 wxcore_bind.h, 1.18, 1.19 wxgl_bind.h, 1.15, 1.16 wxhtml_bind.h, 1.16, 1.17 wxmedia_bind.h, 1.15, 1.16 wxnet_bind.h, 1.15, 1.16 wxrichtext_bind.h, 1.15, 1.16 wxstc_bind.h, 1.15, 1.16 wxxml_bind.h, 1.15, 1.16 wxxrc_bind.h, 1.15, 1.16

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

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

Modified Files:
	wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h 
	wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h 
	wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h 
Log Message:
Fix last commit to really use the wxlua_getenumtype() and wxlua_getuintegertype() functions.


Index: wxadv_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxadv_bind.h	24 Mar 2009 04:15:08 -0000	1.17
--- wxadv_bind.h	31 Mar 2009 04:23:42 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxcore_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxcore_bind.h	24 Mar 2009 04:15:08 -0000	1.18
--- wxcore_bind.h	31 Mar 2009 04:23:42 -0000	1.19
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxrichtext_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxrichtext_bind.h	24 Mar 2009 04:15:10 -0000	1.15
--- wxrichtext_bind.h	31 Mar 2009 04:23:42 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxxrc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxxrc_bind.h	24 Mar 2009 04:15:10 -0000	1.15
--- wxxrc_bind.h	31 Mar 2009 04:23:42 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxnet_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxnet_bind.h	24 Mar 2009 04:15:10 -0000	1.15
--- wxnet_bind.h	31 Mar 2009 04:23:42 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxbase_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxbase_bind.h	24 Mar 2009 04:15:08 -0000	1.16
--- wxbase_bind.h	31 Mar 2009 04:23:42 -0000	1.17
***************
*** 19,25 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 19,25 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxmedia_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxmedia_bind.h	24 Mar 2009 04:15:09 -0000	1.15
--- wxmedia_bind.h	31 Mar 2009 04:23:42 -0000	1.16
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxgl_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxgl_bind.h	24 Mar 2009 04:15:09 -0000	1.15
--- wxgl_bind.h	31 Mar 2009 04:23:42 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxstc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxstc_bind.h	24 Mar 2009 04:15:10 -0000	1.15
--- wxstc_bind.h	31 Mar 2009 04:23:42 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxaui_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxaui_bind.h	24 Mar 2009 04:15:08 -0000	1.16
--- wxaui_bind.h	31 Mar 2009 04:23:42 -0000	1.17
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxhtml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxhtml_bind.h	24 Mar 2009 04:15:09 -0000	1.16
--- wxhtml_bind.h	31 Mar 2009 04:23:42 -0000	1.17
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

Index: wxxml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxxml_bind.h	24 Mar 2009 04:15:10 -0000	1.15
--- wxxml_bind.h	31 Mar 2009 04:23:42 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxluasocket/include wxluasocket_bind.h, 1.37, 1.38

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

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

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


Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wxluasocket_bind.h	24 Mar 2009 04:15:33 -0000	1.37
--- wxluasocket_bind.h	31 Mar 2009 04:23:42 -0000	1.38
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h, 1.45, 1.46 wxlua_bind.h, 1.16, 1.17

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

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

Modified Files:
	wxldefs.h wxlua_bind.h 
Log Message:
Fix last commit to really use the wxlua_getenumtype() and wxlua_getuintegertype() functions.


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxldefs.h	24 Mar 2009 04:15:31 -0000	1.45
--- wxldefs.h	31 Mar 2009 04:23:42 -0000	1.46
***************
*** 65,69 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 25
  
  // ----------------------------------------------------------------------------
--- 65,69 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 26
  
  // ----------------------------------------------------------------------------

Index: wxlua_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxlua_bind.h	24 Mar 2009 04:15:32 -0000	1.16
--- wxlua_bind.h	31 Mar 2009 04:23:42 -0000	1.17
***************
*** 17,23 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 17,23 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

[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

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan_bind.h,1.4,1.5

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

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

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


Index: wxluacan_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxluacan_bind.h	24 Mar 2009 04:15:04 -0000	1.4
--- wxluacan_bind.h	31 Mar 2009 04:23:42 -0000	1.5
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 26
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 26
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxluasocket/include wxluasocket_bind.h, 1.36, 1.37

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10993/wxLua/modules/wxluasocket/include

Modified Files:
	wxluasocket_bind.h 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** wxluasocket_bind.h	22 Oct 2008 05:31:46 -0000	1.36
--- wxluasocket_bind.h	24 Mar 2009 04:15:33 -0000	1.37
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/include wxldefs.h, 1.44, 1.45 wxlstate.h, 1.122, 1.123 wxlua_bind.h, 1.15, 1.16

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10993/wxLua/modules/wxlua/include

Modified Files:
	wxldefs.h wxlstate.h wxlua_bind.h 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** wxldefs.h	22 Oct 2008 05:31:46 -0000	1.44
--- wxldefs.h	24 Mar 2009 04:15:31 -0000	1.45
***************
*** 36,42 ****
  #define wxLUA_MAJOR_VERSION       2
  #define wxLUA_MINOR_VERSION       8
! #define wxLUA_RELEASE_NUMBER      9
  #define wxLUA_SUBRELEASE_NUMBER   0
! #define wxLUA_VERSION_STRING      wxT("wxLua 2.8.9.0")
  
  // For non-Unix systems (i.e. when building without a configure script),
--- 36,42 ----
  #define wxLUA_MAJOR_VERSION       2
  #define wxLUA_MINOR_VERSION       8
! #define wxLUA_RELEASE_NUMBER      10
  #define wxLUA_SUBRELEASE_NUMBER   0
! #define wxLUA_VERSION_STRING      wxT("wxLua 2.8.10.0")
  
  // For non-Unix systems (i.e. when building without a configure script),
***************
*** 65,69 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 24
  
  // ----------------------------------------------------------------------------
--- 65,69 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 25
  
  // ----------------------------------------------------------------------------

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** wxlstate.h	3 Dec 2008 05:26:03 -0000	1.122
--- wxlstate.h	24 Mar 2009 04:15:31 -0000	1.123
***************
*** 483,487 ****
--- 483,489 ----
  WXDLLIMPEXP_WXLUA wxString LUACALL    wxlua_getwxStringtype(lua_State* L, int stack_idx);
  WXDLLIMPEXP_WXLUA bool LUACALL        wxlua_getbooleantype(lua_State* L, int stack_idx);
+ WXDLLIMPEXP_WXLUA long LUACALL        wxlua_getenumtype(lua_State* L, int stack_idx);
  WXDLLIMPEXP_WXLUA long LUACALL        wxlua_getintegertype(lua_State* L, int stack_idx);
+ WXDLLIMPEXP_WXLUA unsigned long LUACALL wxlua_getuintegertype(lua_State* L, int stack_idx);
  WXDLLIMPEXP_WXLUA double LUACALL      wxlua_getnumbertype(lua_State* L, int stack_idx);
  

Index: wxlua_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxlua_bind.h	22 Oct 2008 05:31:46 -0000	1.15
--- wxlua_bind.h	24 Mar 2009 04:15:32 -0000	1.16
***************
*** 17,23 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 17,23 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxbind/include wxadv_bind.h, 1.16, 1.17 wxaui_bind.h, 1.15, 1.16 wxbase_bind.h, 1.15, 1.16 wxcore_bind.h, 1.17, 1.18 wxgl_bind.h, 1.14, 1.15 wxhtml_bind.h, 1.15, 1.16 wxmedia_bind.h, 1.14, 1.15 wxnet_bind.h, 1.14, 1.15 wxrichtext_bind.h, 1.14, 1.15 wxstc_bind.h, 1.14, 1.15 wxxml_bind.h, 1.14, 1.15 wxxrc_bind.h, 1.14, 1.15

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10993/wxLua/modules/wxbind/include

Modified Files:
	wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h 
	wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h 
	wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxadv_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxadv_bind.h	13 Dec 2008 22:35:52 -0000	1.16
--- wxadv_bind.h	24 Mar 2009 04:15:08 -0000	1.17
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxcore_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxcore_bind.h	4 Dec 2008 05:12:38 -0000	1.17
--- wxcore_bind.h	24 Mar 2009 04:15:08 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxrichtext_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxrichtext_bind.h	22 Oct 2008 05:31:45 -0000	1.14
--- wxrichtext_bind.h	24 Mar 2009 04:15:10 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxxrc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxxrc_bind.h	22 Oct 2008 05:31:45 -0000	1.14
--- wxxrc_bind.h	24 Mar 2009 04:15:10 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxnet_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxnet_bind.h	22 Oct 2008 05:31:45 -0000	1.14
--- wxnet_bind.h	24 Mar 2009 04:15:10 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxbase_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxbase_bind.h	22 Oct 2008 05:31:45 -0000	1.15
--- wxbase_bind.h	24 Mar 2009 04:15:08 -0000	1.16
***************
*** 19,25 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 19,25 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxmedia_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxmedia_bind.h	22 Oct 2008 05:31:45 -0000	1.14
--- wxmedia_bind.h	24 Mar 2009 04:15:09 -0000	1.15
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxgl_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxgl_bind.h	22 Oct 2008 05:31:45 -0000	1.14
--- wxgl_bind.h	24 Mar 2009 04:15:09 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxstc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxstc_bind.h	22 Oct 2008 05:31:45 -0000	1.14
--- wxstc_bind.h	24 Mar 2009 04:15:10 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxaui_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxaui_bind.h	22 Oct 2008 05:31:45 -0000	1.15
--- wxaui_bind.h	24 Mar 2009 04:15:08 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxhtml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxhtml_bind.h	22 Oct 2008 05:31:45 -0000	1.15
--- wxhtml_bind.h	24 Mar 2009 04:15:09 -0000	1.16
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

Index: wxxml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxxml_bind.h	22 Oct 2008 05:31:45 -0000	1.14
--- wxxml_bind.h	24 Mar 2009 04:15:10 -0000	1.15
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

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

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** genwxbind.lua	31 Oct 2008 05:25:08 -0000	1.176
--- genwxbind.lua	24 Mar 2009 04:15:04 -0000	1.177
***************
*** 18,22 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 24 -- 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 = 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.
***************
*** 33,36 ****
--- 33,38 ----
  dataTypeTable       = {} -- all datatypes; int, double, class names, see AllocDataType
  dataTypeAttribTable = {} -- attributes for data types; unsigned, const
+ dataTypeUIntTable   = {} -- datatypes that are unsigned numbers
+ dataTypeBoolTable   = {} -- datatypes that are boolean
  functionAttribTable = {} -- attributes for functions; static, virtual
  
***************
*** 188,191 ****
--- 190,194 ----
  -- Allocate a data type description table (int, double, class...) to dataTypeTable
  -- ---------------------------------------------------------------------------
+ 
  function AllocDataType(name, value_type, is_number, abstract)
      dataTypeTable[name] =
***************
*** 218,228 ****
      AllocDataType("time_t",             "number", true)
      AllocDataType("unsigned char",      "number", true)
      AllocDataType("unsigned int",       "number", true)
      AllocDataType("unsigned long",      "number", true)
-     AllocDataType("unsigned short",     "number", true)
      AllocDataType("uchar",              "number", true)
      AllocDataType("uint",               "number", true)
      AllocDataType("ulong",              "number", true)
-     AllocDataType("ushort",             "number", true)
      AllocDataType("void",               "number", true)
      AllocDataType("wchar_t",            "number", true)
--- 221,231 ----
      AllocDataType("time_t",             "number", true)
      AllocDataType("unsigned char",      "number", true)
+     AllocDataType("unsigned short",     "number", true)
      AllocDataType("unsigned int",       "number", true)
      AllocDataType("unsigned long",      "number", true)
      AllocDataType("uchar",              "number", true)
+     AllocDataType("ushort",             "number", true)
      AllocDataType("uint",               "number", true)
      AllocDataType("ulong",              "number", true)
      AllocDataType("void",               "number", true)
      AllocDataType("wchar_t",            "number", true)
***************
*** 282,285 ****
--- 285,312 ----
      dataTypeAttribTable["%ungc"]   = true -- this object won't be gc by Lua
  
+     -- datatypes that are unsigned integers to be treated differently
+     dataTypeUIntTable["size_t"]         = true
+     dataTypeUIntTable["time_t"]         = true
+     dataTypeUIntTable["unsigned char"]  = true
+     dataTypeUIntTable["unsigned short"] = true
+     dataTypeUIntTable["unsigned int"]   = true
+     dataTypeUIntTable["unsigned long"]  = true
+     dataTypeUIntTable["uchar"]          = true
+     dataTypeUIntTable["ushort"]         = true
+     dataTypeUIntTable["uint"]           = true
+     dataTypeUIntTable["ulong"]          = true
+     dataTypeUIntTable["void"]           = true
+ 
+     dataTypeUIntTable["wxUint8"]        = true
+     dataTypeUIntTable["wxUint16"]       = true
+     dataTypeUIntTable["wxUint32"]       = true
+     dataTypeUIntTable["wxUint64"]       = true
+     dataTypeUIntTable["wxMemorySize"]   = true
+     dataTypeUIntTable["wxFileOffset"]   = true
+ 
+     -- datatypes that are boolean integers to be treated differently
+     dataTypeBoolTable["bool"] = true
+     dataTypeBoolTable["BOOL"] = true
+ 
      -- attributes that can precede a function (must set equal to true)
      functionAttribTable["static"]  = true
***************
*** 483,486 ****
--- 510,527 ----
  
  -- ---------------------------------------------------------------------------
+ -- Is this data type an unsigned integer
+ -- ---------------------------------------------------------------------------
+ function IsDataTypeUInt(datatype)
+     local dtype = GetDataTypedefBase(datatype)
+     if dtype then
+         return dataTypeUIntTable[dtype.Name] or false
+     else
+         print("ERROR: Missing data type '"..tostring(datatype).."' in IsDataTypeUInt.")
+     end
+ 
+     return false
+ end
+ 
+ -- ---------------------------------------------------------------------------
  -- Is this data type an enum
  -- ---------------------------------------------------------------------------
***************
*** 497,500 ****
--- 538,555 ----
  
  -- ---------------------------------------------------------------------------
+ -- Is this data type a boolean
+ -- ---------------------------------------------------------------------------
+ function IsDataTypeBool(datatype)
+     local dtype = GetDataTypedefBase(datatype)
+     if dtype then
+         return dataTypeBoolTable[dtype.Name] or false
+     else
+         print("ERROR: Missing data type '"..tostring(datatype).."' in IsDataTypeBool.")
+     end
+ 
+     return false
+ end
+ 
+ -- ---------------------------------------------------------------------------
  -- Is the input in the 'bindingDelimiters' table?
  -- ---------------------------------------------------------------------------
***************
*** 2909,2913 ****
                      table.insert(codeList, "    wxluaT_pushuserdatatype(L, "..self_name..member.Name..", wxluatype_"..MakeClassVar(memberType)..");\n")
  
!                 elseif (memberType == "BOOL") or (memberType == "bool") then
                      CommentBindingTable(codeList, "    // push the result flag\n")
                      table.insert(codeList, "    lua_pushboolean(L, "..self_name..member.Name..");\n")
--- 2964,2968 ----
                      table.insert(codeList, "    wxluaT_pushuserdatatype(L, "..self_name..member.Name..", wxluatype_"..MakeClassVar(memberType)..");\n")
  
!                 elseif IsDataTypeBool(memberType) then
                      CommentBindingTable(codeList, "    // push the result flag\n")
                      table.insert(codeList, "    lua_pushboolean(L, "..self_name..member.Name..");\n")
***************
*** 2994,2998 ****
                      CommentBindingTable(codeList, "    // get the data type value\n")
                      table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, "..stack_idx..", wxluatype_"..MakeClassVar(memberType)..");\n")
!                 elseif (memberType == "BOOL") or (memberType == "bool") then
                      overload_argList = overload_argList.."&wxluatype_TBOOLEAN, "
                      CommentBindingTable(codeList, "    // get the boolean value\n")
--- 3049,3053 ----
                      CommentBindingTable(codeList, "    // get the data type value\n")
                      table.insert(codeList, "    "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, "..stack_idx..", wxluatype_"..MakeClassVar(memberType)..");\n")
!                 elseif IsDataTypeBool(memberType) then
                      overload_argList = overload_argList.."&wxluatype_TBOOLEAN, "
                      CommentBindingTable(codeList, "    // get the boolean value\n")
***************
*** 3000,3005 ****
                  elseif IsDataTypeEnum(memberType) then
                      overload_argList = overload_argList.."&wxluatype_TINTEGER, "
!                     CommentBindingTable(codeList, "    // get the number value\n")
!                     table.insert(codeList, "    "..memberType.." val = ("..memberType..")wxlua_getintegertype(L, "..stack_idx..");\n")
                  else
                      overload_argList = overload_argList.."&wxluatype_TNUMBER, "
--- 3055,3064 ----
                  elseif IsDataTypeEnum(memberType) then
                      overload_argList = overload_argList.."&wxluatype_TINTEGER, "
!                     CommentBindingTable(codeList, "    // get the enum value\n")
!                     table.insert(codeList, "    "..memberType.." val = ("..memberType..")wxlua_getenumtype(L, "..stack_idx..");\n")
!                 elseif IsDataTypeUInt(memberType) then
!                     overload_argList = overload_argList.."&wxluatype_TINTEGER, "
!                     CommentBindingTable(codeList, "    // get the unsigned integer value\n")
!                     table.insert(codeList, "    "..memberType.." val = ("..memberType..")wxlua_getuintegertype(L, "..stack_idx..");\n")
                  else
                      overload_argList = overload_argList.."&wxluatype_TNUMBER, "
***************
*** 3476,3485 ****
                                  end
                              end
!                         elseif (argType == "bool") or (argType == "BOOL") 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_getintegertype(L, "..argNum..")"
                          elseif not numeric then
                              overload_argList = overload_argList.."&wxluatype_"..MakeClassVar(argType)..", "
--- 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)..", "
***************
*** 3869,3873 ****
                              CommentBindingTable(codeList, "    // push the result datatype\n")
                              table.insert(codeList, "    wxluaT_pushuserdatatype(L, returns, wxluatype_"..MakeClassVar(memberType)..");\n")
!                         elseif (member.DataType == "BOOL") or (member.DataType == "bool") then
                              CommentBindingTable(codeList, "    // push the result flag\n")
                              table.insert(codeList, "    lua_pushboolean(L, returns);\n")
--- 3931,3935 ----
                              CommentBindingTable(codeList, "    // push the result datatype\n")
                              table.insert(codeList, "    wxluaT_pushuserdatatype(L, returns, wxluatype_"..MakeClassVar(memberType)..");\n")
!                         elseif IsDataTypeBool(member.DataType) then
                              CommentBindingTable(codeList, "    // push the result flag\n")
                              table.insert(codeList, "    lua_pushboolean(L, returns);\n")

[Wxlua-commit] wxLua/bindings/wxwidgets wxadv_override.hpp, 1.7, 1.8 wxbase_override.hpp, 1.17, 1.18 wxcore_override.hpp, 1.19, 1.20 wxstc_stc.i, 1.2, 1.3 wxxml_override.hpp, 1.9, 1.10

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

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

Modified Files:
	wxadv_override.hpp wxbase_override.hpp wxcore_override.hpp 
	wxstc_stc.i wxxml_override.hpp 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxbase_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxbase_override.hpp	29 Jan 2008 00:49:11 -0000	1.17
--- wxbase_override.hpp	24 Mar 2009 04:15:07 -0000	1.18
***************
*** 618,622 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
--- 618,622 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getenumtype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
***************
*** 642,646 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
--- 642,646 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getenumtype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
***************
*** 668,672 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      // const wxString fullpath
      const wxString fullpath = wxlua_getwxStringtype(L, 1);
--- 668,672 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getenumtype(L, 2) : wxPATH_NATIVE);
      // const wxString fullpath
      const wxString fullpath = wxlua_getwxStringtype(L, 1);

Index: wxadv_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxadv_override.hpp	26 Feb 2008 14:51:34 -0000	1.7
--- wxadv_override.hpp	24 Mar 2009 04:15:07 -0000	1.8
***************
*** 202,206 ****
      int argCount = lua_gettop(L);
      // wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells
!     wxGrid::wxGridSelectionModes selmode = (argCount >= 4 ? (wxGrid::wxGridSelectionModes)wxlua_getintegertype(L, 4) : wxGrid::wxGridSelectCells);
      // bool takeOwnership = false
      bool takeOwnership = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false);
--- 202,206 ----
      int argCount = lua_gettop(L);
      // wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells
!     wxGrid::wxGridSelectionModes selmode = (argCount >= 4 ? (wxGrid::wxGridSelectionModes)wxlua_getenumtype(L, 4) : wxGrid::wxGridSelectCells);
      // bool takeOwnership = false
      bool takeOwnership = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false);

Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxcore_override.hpp	23 Jan 2008 06:43:34 -0000	1.19
--- wxcore_override.hpp	24 Mar 2009 04:15:07 -0000	1.20
***************
*** 166,170 ****
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)(int)wxlua_getintegertype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject *self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
--- 166,170 ----
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)(int)wxlua_getenumtype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject *self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
***************
*** 771,775 ****
      //wxKillError * rc = (argCount >= 3 ? (wxKillError *)wxlua_touserdata(L, 3) : NULL);
      // wxSignal sig = wxSIGTERM
!     wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getintegertype(L, 2) : wxSIGTERM);
      // long pid
      long pid = (long)wxlua_getnumbertype(L, 1);
--- 771,775 ----
      //wxKillError * rc = (argCount >= 3 ? (wxKillError *)wxlua_touserdata(L, 3) : NULL);
      // wxSignal sig = wxSIGTERM
!     wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getenumtype(L, 2) : wxSIGTERM);
      // long pid
      long pid = (long)wxlua_getnumbertype(L, 1);
***************
*** 1359,1363 ****
      wxFontEncoding altEncoding;
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 2);
      // get this
      wxFontMapper *self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
--- 1359,1363 ----
      wxFontEncoding altEncoding;
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 2);
      // get this
      wxFontMapper *self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
***************
*** 2195,2199 ****
                      lua_gettable(L, -2);
                      if (lua_isnumber(L, -1))
!                         kind = (wxItemKind)wxlua_getintegertype(L, -1);
                      lua_pop(L, 1);
  
--- 2195,2199 ----
                      lua_gettable(L, -2);
                      if (lua_isnumber(L, -1))
!                         kind = (wxItemKind)wxlua_getenumtype(L, -1);
                      lua_pop(L, 1);
  
***************
*** 2269,2273 ****
      // bool isCheckable = false
      // This used to be a bool instead of a wxItemKind
!     wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlua_getintegertype(L, 5) : wxITEM_NORMAL);
      // const wxString& help = wxEmptyString
      wxString help = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));
--- 2269,2273 ----
      // bool isCheckable = false
      // This used to be a bool instead of a wxItemKind
!     wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlua_getenumtype(L, 5) : wxITEM_NORMAL);
      // const wxString& help = wxEmptyString
      wxString help = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));

Index: wxstc_stc.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_stc.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxstc_stc.i	18 Dec 2007 01:03:32 -0000	1.2
--- wxstc_stc.i	24 Mar 2009 04:15:07 -0000	1.3
***************
*** 1819,1823 ****
      // Set the current styling position to pos and the styling mask to mask.
      // The styling mask can be used to protect some bits in each styling byte from modification.
!     void StartStyling(int pos, int mask);
  
      // Change style from current styling position for length characters to a style
--- 1819,1823 ----
      // Set the current styling position to pos and the styling mask to mask.
      // The styling mask can be used to protect some bits in each styling byte from modification.
!     void StartStyling(int pos, unsigned int mask);
  
      // Change style from current styling position for length characters to a style
***************
*** 1861,1871 ****
  
      // Get a bit mask of all the markers set on a line.
!     int MarkerGet(int line);
  
      // Find the next line after lineStart that includes a marker in mask.
!     int MarkerNext(int lineStart, int markerMask);
  
      // Find the previous line before lineStart that includes a marker in mask.
!     int MarkerPrevious(int lineStart, int markerMask);
  
      // Define a marker from a bitmap
--- 1861,1871 ----
  
      // Get a bit mask of all the markers set on a line.
!     unsigned int MarkerGet(int line);
  
      // Find the next line after lineStart that includes a marker in mask.
!     int MarkerNext(int lineStart, unsigned int markerMask);
  
      // Find the previous line before lineStart that includes a marker in mask.
!     int MarkerPrevious(int lineStart, unsigned int markerMask);
  
      // Define a marker from a bitmap
***************
*** 1888,1895 ****
  
      // Set a mask that determines which markers are displayed in a margin.
!     void SetMarginMask(int margin, int mask);
  
      // Retrieve the marker mask of a margin.
!     int GetMarginMask(int margin);
  
      // Make a margin sensitive or insensitive to mouse clicks.
--- 1888,1895 ----
  
      // Set a mask that determines which markers are displayed in a margin.
!     void SetMarginMask(int margin, unsigned int mask); // NOTE: wxSTC has "int mask", but we need all the bits so we force uint
  
      // Retrieve the marker mask of a margin.
!     unsigned int GetMarginMask(int margin);
  
      // Make a margin sensitive or insensitive to mouse clicks.

Index: wxxml_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxxml_override.hpp	23 Jan 2008 06:43:34 -0000	1.9
--- wxxml_override.hpp	24 Mar 2009 04:15:07 -0000	1.10
***************
*** 23,27 ****
      const wxString name = wxlua_getwxStringtype(L, 3);
      // wxXmlNodeType type
!     wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2);
      // wxXmlNode parent
      wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlNode);
--- 23,27 ----
      const wxString name = wxlua_getwxStringtype(L, 3);
      // wxXmlNodeType type
!     wxXmlNodeType type = (wxXmlNodeType)wxlua_getenumtype(L, 2);
      // wxXmlNode parent
      wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlNode);

[Wxlua-commit] wxLua/docs changelog.txt,1.67,1.68

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

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

Modified Files:
	changelog.txt 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: changelog.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** changelog.txt	4 Dec 2008 05:12:38 -0000	1.67
--- changelog.txt	24 Mar 2009 04:15:07 -0000	1.68
***************
*** 2,6 ****
   ===============
  
!  version 2.8.9.0
   --------------------------------------------------------------------
  
--- 2,6 ----
   ===============
  
!  version 2.8.10.0
   --------------------------------------------------------------------
  
***************
*** 18,21 ****
--- 18,23 ----
     on the stack. The default is to leave none as before.
   - Added wxTextUrlEvent to the bindings.
+  - Fixed double -> unsigned integer using all 32 bits conversion. 
+    Fixes wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin. 
  
   version 2.8.7.0  (released 02/02/2008)

[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp, 1.16, 1.17 wxaui_bind.cpp, 1.13, 1.14 wxbase_base.cpp, 1.13, 1.14 wxbase_bind.cpp, 1.15, 1.16 wxbase_data.cpp, 1.17, 1.18 wxbase_datetime.cpp, 1.13, 1.14 wxbase_file.cpp, 1.15, 1.16 wxcore_bind.cpp, 1.20, 1.21 wxcore_clipdrag.cpp, 1.14, 1.15 wxcore_controls.cpp, 1.17, 1.18 wxcore_core.cpp, 1.12, 1.13 wxcore_defsutils.cpp, 1.12, 1.13 wxcore_event.cpp, 1.15, 1.16 wxcore_gdi.cpp, 1.20, 1.21 wxcore_help.cpp, 1.13, 1.14 wxcore_mdi.cpp, 1.13, 1.14 wxcore_menutool.cpp, 1.14, 1.15 wxcore_print.cpp, 1.14, 1.15 wxcore_sizer.cpp, 1.13, 1.14 wxcore_windows.cpp, 1.16, 1.17 wxhtml_bind.cpp, 1.10, 1.11 wxmedia_bind.cpp, 1.10, 1.11 wxnet_bind.cpp, 1.11, 1.12 wxstc_bind.cpp, 1.11, 1.12 wxxml_bind.cpp, 1.10, 1.11

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10993/wxLua/modules/wxbind/src

Modified Files:
	wxadv_bind.cpp wxaui_bind.cpp wxbase_base.cpp wxbase_bind.cpp 
	wxbase_data.cpp wxbase_datetime.cpp wxbase_file.cpp 
	wxcore_bind.cpp wxcore_clipdrag.cpp wxcore_controls.cpp 
	wxcore_core.cpp wxcore_defsutils.cpp wxcore_event.cpp 
	wxcore_gdi.cpp wxcore_help.cpp wxcore_mdi.cpp 
	wxcore_menutool.cpp wxcore_print.cpp wxcore_sizer.cpp 
	wxcore_windows.cpp wxhtml_bind.cpp wxmedia_bind.cpp 
	wxnet_bind.cpp wxstc_bind.cpp wxxml_bind.cpp 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxcore_core.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxcore_core.cpp	29 Jan 2008 04:22:52 -0000	1.12
--- wxcore_core.cpp	24 Mar 2009 04:15:24 -0000	1.13
***************
*** 231,235 ****
  {
      // wxSystemColour index
!     wxSystemColour index = (wxSystemColour)wxlua_getintegertype(L, 1);
      // call GetColour
      // allocate a new object using the copy constructor
--- 231,235 ----
  {
      // wxSystemColour index
!     wxSystemColour index = (wxSystemColour)wxlua_getenumtype(L, 1);
      // call GetColour
      // allocate a new object using the copy constructor
***************
*** 253,257 ****
  {
      // wxSystemFont index
!     wxSystemFont index = (wxSystemFont)wxlua_getintegertype(L, 1);
      // call GetFont
      // allocate a new object using the copy constructor
--- 253,257 ----
  {
      // wxSystemFont index
!     wxSystemFont index = (wxSystemFont)wxlua_getenumtype(L, 1);
      // call GetFont
      // allocate a new object using the copy constructor
***************
*** 278,282 ****
      wxWindow * win = (argCount >= 2 ? (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow) : NULL);
      // wxSystemMetric index
!     wxSystemMetric index = (wxSystemMetric)wxlua_getintegertype(L, 1);
      // call GetMetric
      int returns = (wxSystemSettings::GetMetric(index, win));
--- 278,282 ----
      wxWindow * win = (argCount >= 2 ? (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow) : NULL);
      // wxSystemMetric index
!     wxSystemMetric index = (wxSystemMetric)wxlua_getenumtype(L, 1);
      // call GetMetric
      int returns = (wxSystemSettings::GetMetric(index, win));
***************
*** 307,311 ****
  {
      // wxSystemFeature index
!     wxSystemFeature index = (wxSystemFeature)wxlua_getintegertype(L, 1);
      // call HasFeature
      bool returns = (wxSystemSettings::HasFeature(index));
--- 307,311 ----
  {
      // wxSystemFeature index
!     wxSystemFeature index = (wxSystemFeature)wxlua_getenumtype(L, 1);
      // call HasFeature
      bool returns = (wxSystemSettings::HasFeature(index));
***************
*** 323,327 ****
  {
      // wxSystemScreenType screen
!     wxSystemScreenType screen = (wxSystemScreenType)wxlua_getintegertype(L, 1);
      // call SetScreenType
      wxSystemSettings::SetScreenType(screen);
--- 323,327 ----
  {
      // wxSystemScreenType screen
!     wxSystemScreenType screen = (wxSystemScreenType)wxlua_getenumtype(L, 1);
      // call SetScreenType
      wxSystemSettings::SetScreenType(screen);

Index: wxcore_clipdrag.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxcore_clipdrag.cpp	21 Oct 2008 04:23:18 -0000	1.14
--- wxcore_clipdrag.cpp	24 Mar 2009 04:15:19 -0000	1.15
***************
*** 453,457 ****
  {
      // wxDataFormatId format
!     wxDataFormatId format = (wxDataFormatId)wxlua_getintegertype(L, 2);
      // get this
      wxDataFormat * self = (wxDataFormat *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataFormat);
--- 453,457 ----
  {
      // wxDataFormatId format
!     wxDataFormatId format = (wxDataFormatId)wxlua_getenumtype(L, 2);
      // get this
      wxDataFormat * self = (wxDataFormat *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataFormat);
***************
*** 510,514 ****
      int argCount = lua_gettop(L);
      // wxDataFormatId format = wxDF_INVALID
!     wxDataFormatId format = (argCount >= 1 ? (wxDataFormatId)wxlua_getintegertype(L, 1) : wxDF_INVALID);
      // call constructor
      wxDataFormat* returns = new wxDataFormat(format);
--- 510,514 ----
      int argCount = lua_gettop(L);
      // wxDataFormatId format = wxDF_INVALID
!     wxDataFormatId format = (argCount >= 1 ? (wxDataFormatId)wxlua_getenumtype(L, 1) : wxDF_INVALID);
      // call constructor
      wxDataFormat* returns = new wxDataFormat(format);
***************
*** 574,578 ****
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)(int)wxlua_getintegertype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject *self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
--- 574,578 ----
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)(int)wxlua_getenumtype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject *self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
***************
*** 666,670 ****
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)wxlua_getintegertype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject * self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
--- 666,670 ----
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)wxlua_getenumtype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject * self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
***************
*** 686,690 ****
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)wxlua_getintegertype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject * self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
--- 686,690 ----
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)wxlua_getenumtype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject * self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
***************
*** 1434,1438 ****
  {
      // wxDragResult effect
!     wxDragResult effect = (wxDragResult)wxlua_getintegertype(L, 2);
      // get this
      wxDropSource * self = (wxDropSource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDropSource);
--- 1434,1438 ----
  {
      // wxDragResult effect
!     wxDragResult effect = (wxDragResult)wxlua_getenumtype(L, 2);
      // get this
      wxDropSource * self = (wxDropSource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDropSource);
***************
*** 1456,1460 ****
      const wxCursor * cursor = (const wxCursor *)wxluaT_getuserdatatype(L, 3, wxluatype_wxCursor);
      // wxDragResult res
!     wxDragResult res = (wxDragResult)wxlua_getintegertype(L, 2);
      // get this
      wxDropSource * self = (wxDropSource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDropSource);
--- 1456,1460 ----
      const wxCursor * cursor = (const wxCursor *)wxluaT_getuserdatatype(L, 3, wxluatype_wxCursor);
      // wxDragResult res
!     wxDragResult res = (wxDragResult)wxlua_getenumtype(L, 2);
      // get this
      wxDropSource * self = (wxDropSource *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDropSource);

Index: wxcore_event.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_event.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxcore_event.cpp	29 Jan 2008 04:22:52 -0000	1.15
--- wxcore_event.cpp	24 Mar 2009 04:15:25 -0000	1.16
***************
*** 2305,2309 ****
  {
      // wxIdleMode mode
!     wxIdleMode mode = (wxIdleMode)wxlua_getintegertype(L, 1);
      // call SetMode
      wxIdleEvent::SetMode(mode);
--- 2305,2309 ----
  {
      // wxIdleMode mode
!     wxIdleMode mode = (wxIdleMode)wxlua_getenumtype(L, 1);
      // call SetMode
      wxIdleEvent::SetMode(mode);
***************
*** 4582,4586 ****
  {
      // wxUpdateUIMode mode
!     wxUpdateUIMode mode = (wxUpdateUIMode)wxlua_getintegertype(L, 1);
      // call SetMode
      wxUpdateUIEvent::SetMode(mode);
--- 4582,4586 ----
  {
      // wxUpdateUIMode mode
!     wxUpdateUIMode mode = (wxUpdateUIMode)wxlua_getenumtype(L, 1);
      // call SetMode
      wxUpdateUIEvent::SetMode(mode);
***************
*** 4810,4814 ****
  {
      // wxHelpEvent::Origin origin
!     wxHelpEvent::Origin origin = (wxHelpEvent::Origin)wxlua_getintegertype(L, 2);
      // get this
      wxHelpEvent * self = (wxHelpEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHelpEvent);
--- 4810,4814 ----
  {
      // wxHelpEvent::Origin origin
!     wxHelpEvent::Origin origin = (wxHelpEvent::Origin)wxlua_getenumtype(L, 2);
      // get this
      wxHelpEvent * self = (wxHelpEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxHelpEvent);
***************
*** 4870,4874 ****
      int argCount = lua_gettop(L);
      // wxHelpEvent::Origin origin = wxHelpEvent::Origin_Unknown
!     wxHelpEvent::Origin origin = (argCount >= 4 ? (wxHelpEvent::Origin)wxlua_getintegertype(L, 4) : wxHelpEvent::Origin_Unknown);
      // const wxPoint pt = wxDefaultPosition
      const wxPoint * pt = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, wxluatype_wxPoint) : &wxDefaultPosition);
--- 4870,4874 ----
      int argCount = lua_gettop(L);
      // wxHelpEvent::Origin origin = wxHelpEvent::Origin_Unknown
!     wxHelpEvent::Origin origin = (argCount >= 4 ? (wxHelpEvent::Origin)wxlua_getenumtype(L, 4) : wxHelpEvent::Origin_Unknown);
      // const wxPoint pt = wxDefaultPosition
      const wxPoint * pt = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, wxluatype_wxPoint) : &wxDefaultPosition);

Index: wxcore_gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxcore_gdi.cpp	30 Oct 2008 04:14:25 -0000	1.20
--- wxcore_gdi.cpp	24 Mar 2009 04:15:27 -0000	1.21
***************
*** 2114,2118 ****
  {
      // wxRegionOp op
!     wxRegionOp op = (wxRegionOp)wxlua_getintegertype(L, 3);
      // const wxRegion region
      const wxRegion * region = (const wxRegion *)wxluaT_getuserdatatype(L, 2, wxluatype_wxRegion);
--- 2114,2118 ----
  {
      // wxRegionOp op
!     wxRegionOp op = (wxRegionOp)wxlua_getenumtype(L, 3);
      // const wxRegion region
      const wxRegion * region = (const wxRegion *)wxluaT_getuserdatatype(L, 2, wxluatype_wxRegion);
***************
*** 2137,2141 ****
  {
      // wxRegionOp op
!     wxRegionOp op = (wxRegionOp)wxlua_getintegertype(L, 3);
      // const wxRect rect
      const wxRect * rect = (const wxRect *)wxluaT_getuserdatatype(L, 2, wxluatype_wxRect);
--- 2137,2141 ----
  {
      // wxRegionOp op
!     wxRegionOp op = (wxRegionOp)wxlua_getenumtype(L, 3);
      // const wxRect rect
      const wxRect * rect = (const wxRect *)wxluaT_getuserdatatype(L, 2, wxluatype_wxRect);
***************
*** 2160,2164 ****
  {
      // wxRegionOp op
!     wxRegionOp op = (wxRegionOp)wxlua_getintegertype(L, 6);
      // wxCoord h
      wxCoord h = (wxCoord)wxlua_getnumbertype(L, 5);
--- 2160,2164 ----
  {
      // wxRegionOp op
!     wxRegionOp op = (wxRegionOp)wxlua_getenumtype(L, 6);
      // wxCoord h
      wxCoord h = (wxCoord)wxlua_getnumbertype(L, 5);
***************
*** 3364,3368 ****
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getintegertype(L, 5) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));
--- 3364,3368 ----
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getenumtype(L, 5) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));
***************
*** 3370,3374 ****
      int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getintegertype(L, 2);
      // const wxSize pixelSize
      const wxSize * pixelSize = (const wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize);
--- 3370,3374 ----
      int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getenumtype(L, 2);
      // const wxSize pixelSize
      const wxSize * pixelSize = (const wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize);
***************
*** 3391,3395 ****
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString));
--- 3391,3395 ----
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getenumtype(L, 7) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString));
***************
*** 3397,3405 ****
      const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false);
      // wxFontWeight weight
!     wxFontWeight weight = (wxFontWeight)wxlua_getintegertype(L, 4);
      // int style
      int style = (int)wxlua_getnumbertype(L, 3);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getintegertype(L, 2);
      // const wxSize pixelSize
      const wxSize * pixelSize = (const wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize);
--- 3397,3405 ----
      const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false);
      // wxFontWeight weight
!     wxFontWeight weight = (wxFontWeight)wxlua_getenumtype(L, 4);
      // int style
      int style = (int)wxlua_getnumbertype(L, 3);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getenumtype(L, 2);
      // const wxSize pixelSize
      const wxSize * pixelSize = (const wxSize *)wxluaT_getuserdatatype(L, 1, wxluatype_wxSize);
***************
*** 3425,3429 ****
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getintegertype(L, 5) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));
--- 3425,3429 ----
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getenumtype(L, 5) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));
***************
*** 3431,3435 ****
      int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getintegertype(L, 2);
      // int pointSize
      int pointSize = (int)wxlua_getnumbertype(L, 1);
--- 3431,3435 ----
      int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getenumtype(L, 2);
      // int pointSize
      int pointSize = (int)wxlua_getnumbertype(L, 1);
***************
*** 3452,3456 ****
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString));
--- 3452,3456 ----
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getenumtype(L, 7) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString));
***************
*** 3458,3466 ****
      const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false);
      // wxFontWeight weight
!     wxFontWeight weight = (wxFontWeight)wxlua_getintegertype(L, 4);
      // int style
      int style = (int)wxlua_getnumbertype(L, 3);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getintegertype(L, 2);
      // int pointSize
      int pointSize = (int)wxlua_getnumbertype(L, 1);
--- 3458,3466 ----
      const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false);
      // wxFontWeight weight
!     wxFontWeight weight = (wxFontWeight)wxlua_getenumtype(L, 4);
      // int style
      int style = (int)wxlua_getnumbertype(L, 3);
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getenumtype(L, 2);
      // int pointSize
      int pointSize = (int)wxlua_getnumbertype(L, 1);
***************
*** 3501,3505 ****
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 1);
      // call SetDefaultEncoding
      wxFont::SetDefaultEncoding(encoding);
--- 3501,3505 ----
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 1);
      // call SetDefaultEncoding
      wxFont::SetDefaultEncoding(encoding);
***************
*** 3761,3765 ****
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString));
--- 3761,3765 ----
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getenumtype(L, 7) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString));
***************
*** 4080,4084 ****
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
--- 4080,4084 ----
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
***************
*** 4157,4161 ****
  {
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getintegertype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
--- 4157,4161 ----
  {
      // wxFontFamily family
!     wxFontFamily family = (wxFontFamily)wxlua_getenumtype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
***************
*** 4209,4213 ****
  {
      // wxFontStyle style
!     wxFontStyle style = (wxFontStyle)wxlua_getintegertype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
--- 4209,4213 ----
  {
      // wxFontStyle style
!     wxFontStyle style = (wxFontStyle)wxlua_getenumtype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
***************
*** 4241,4245 ****
  {
      // wxFontWeight weight
!     wxFontWeight weight = (wxFontWeight)wxlua_getintegertype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
--- 4241,4245 ----
  {
      // wxFontWeight weight
!     wxFontWeight weight = (wxFontWeight)wxlua_getenumtype(L, 2);
      // get this
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, wxluatype_wxNativeFontInfo);
***************
*** 4449,4453 ****
      bool fixedWidthOnly = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false);
      // wxFontEncoding encoding = wxFONTENCODING_SYSTEM
!     wxFontEncoding encoding = (argCount >= 2 ? (wxFontEncoding)wxlua_getintegertype(L, 2) : wxFONTENCODING_SYSTEM);
      // get this
      wxFontEnumerator * self = (wxFontEnumerator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontEnumerator);
--- 4449,4453 ----
      bool fixedWidthOnly = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false);
      // wxFontEncoding encoding = wxFONTENCODING_SYSTEM
!     wxFontEncoding encoding = (argCount >= 2 ? (wxFontEncoding)wxlua_getenumtype(L, 2) : wxFONTENCODING_SYSTEM);
      // get this
      wxFontEnumerator * self = (wxFontEnumerator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontEnumerator);
***************
*** 4536,4540 ****
      bool fixedWidthOnly = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : false);
      // wxFontEncoding encoding = wxFONTENCODING_SYSTEM
!     wxFontEncoding encoding = (argCount >= 1 ? (wxFontEncoding)wxlua_getintegertype(L, 1) : wxFONTENCODING_SYSTEM);
      // call GetFacenames
      // allocate a new object using the copy constructor
--- 4536,4540 ----
      bool fixedWidthOnly = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : false);
      // wxFontEncoding encoding = wxFONTENCODING_SYSTEM
!     wxFontEncoding encoding = (argCount >= 1 ? (wxFontEncoding)wxlua_getenumtype(L, 1) : wxFONTENCODING_SYSTEM);
      // call GetFacenames
      // allocate a new object using the copy constructor
***************
*** 4650,4654 ****
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 8 ? (wxFontEncoding)wxlua_getintegertype(L, 8) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 7 ? wxlua_getwxStringtype(L, 7) : wxString(wxEmptyString));
--- 4650,4654 ----
      int argCount = lua_gettop(L);
      // wxFontEncoding encoding = wxFONTENCODING_DEFAULT
!     wxFontEncoding encoding = (argCount >= 8 ? (wxFontEncoding)wxlua_getenumtype(L, 8) : wxFONTENCODING_DEFAULT);
      // const wxString faceName = ""
      const wxString faceName = (argCount >= 7 ? wxlua_getwxStringtype(L, 7) : wxString(wxEmptyString));
***************
*** 4755,4759 ****
      wxFontEncoding altEncoding;
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 2);
      // get this
      wxFontMapper *self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
--- 4755,4759 ----
      wxFontEncoding altEncoding;
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 2);
      // get this
      wxFontMapper *self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
***************
*** 4786,4790 ****
  
  #if (wxUSE_INTL) && (wxLUA_USE_wxFontMapper)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxFontMapper_GetEncoding[] = { &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxFontMapper_GetEncoding(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxFontMapper_GetEncoding[1] = {{ wxLua_wxFontMapper_GetEncoding, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxFontMapper_GetEncoding }};
--- 4786,4790 ----
  
  #if (wxUSE_INTL) && (wxLUA_USE_wxFontMapper)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxFontMapper_GetEncoding[] = { &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxFontMapper_GetEncoding(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxFontMapper_GetEncoding[1] = {{ wxLua_wxFontMapper_GetEncoding, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxFontMapper_GetEncoding }};
***************
*** 4793,4797 ****
  {
      // size_t n
!     size_t n = (size_t)wxlua_getnumbertype(L, 1);
      // call GetEncoding
      wxFontEncoding returns = (wxFontMapper::GetEncoding(n));
--- 4793,4797 ----
  {
      // size_t n
!     size_t n = (size_t)wxlua_getuintegertype(L, 1);
      // call GetEncoding
      wxFontEncoding returns = (wxFontMapper::GetEncoding(n));
***************
*** 4809,4813 ****
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 1);
      // call GetEncodingDescription
      wxString returns = (wxFontMapper::GetEncodingDescription(encoding));
--- 4809,4813 ----
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 1);
      // call GetEncodingDescription
      wxString returns = (wxFontMapper::GetEncodingDescription(encoding));
***************
*** 4841,4845 ****
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 1);
      // call GetEncodingName
      wxString returns = (wxFontMapper::GetEncodingName(encoding));
--- 4841,4845 ----
  {
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 1);
      // call GetEncodingName
      wxString returns = (wxFontMapper::GetEncodingName(encoding));
***************
*** 4878,4882 ****
      const wxString facename = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString));
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 2);
      // get this
      wxFontMapper * self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
--- 4878,4882 ----
      const wxString facename = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString));
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 2);
      // get this
      wxFontMapper * self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
***************
*** 6540,6544 ****
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getintegertype(L, 1);
      // call GetBrush
      const wxBrush* returns = (const wxBrush*)wxStockGDI::GetBrush(item);
--- 6540,6544 ----
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getenumtype(L, 1);
      // call GetBrush
      const wxBrush* returns = (const wxBrush*)wxStockGDI::GetBrush(item);
***************
*** 6556,6560 ****
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getintegertype(L, 1);
      // call GetColour
      const wxColour* returns = (const wxColour*)wxStockGDI::GetColour(item);
--- 6556,6560 ----
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getenumtype(L, 1);
      // call GetColour
      const wxColour* returns = (const wxColour*)wxStockGDI::GetColour(item);
***************
*** 6575,6579 ****
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getintegertype(L, 1);
      // call GetCursor
      const wxCursor* returns = (const wxCursor*)wxStockGDI::GetCursor(item);
--- 6575,6579 ----
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getenumtype(L, 1);
      // call GetCursor
      const wxCursor* returns = (const wxCursor*)wxStockGDI::GetCursor(item);
***************
*** 6594,6598 ****
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getintegertype(L, 2);
      // get this
      wxStockGDI * self = (wxStockGDI *)wxluaT_getuserdatatype(L, 1, wxluatype_wxStockGDI);
--- 6594,6598 ----
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getenumtype(L, 2);
      // get this
      wxStockGDI * self = (wxStockGDI *)wxluaT_getuserdatatype(L, 1, wxluatype_wxStockGDI);
***************
*** 6615,6619 ****
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getintegertype(L, 1);
      // call GetPen
      const wxPen* returns = (const wxPen*)wxStockGDI::GetPen(item);
--- 6615,6619 ----
  {
      // wxStockGDI::Item item
!     wxStockGDI::Item item = (wxStockGDI::Item)wxlua_getenumtype(L, 1);
      // call GetPen
      const wxPen* returns = (const wxPen*)wxStockGDI::GetPen(item);
***************
*** 6984,6988 ****
  {
      // wxBitmapType flags
!     wxBitmapType flags = (wxBitmapType)wxlua_getintegertype(L, 3);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 2);
--- 6984,6988 ----
  {
      // wxBitmapType flags
!     wxBitmapType flags = (wxBitmapType)wxlua_getenumtype(L, 3);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 2);
***************
*** 7096,7100 ****
      int desiredWidth = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : -1);
      // wxBitmapType type
!     wxBitmapType type = (wxBitmapType)wxlua_getintegertype(L, 2);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 1);
--- 7096,7100 ----
      int desiredWidth = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : -1);
      // wxBitmapType type
!     wxBitmapType type = (wxBitmapType)wxlua_getenumtype(L, 2);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 1);
***************
*** 7583,7587 ****
  {
      // wxBitmapType type
!     wxBitmapType type = (wxBitmapType)wxlua_getintegertype(L, 3);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 2);
--- 7583,7587 ----
  {
      // wxBitmapType type
!     wxBitmapType type = (wxBitmapType)wxlua_getenumtype(L, 3);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 2);
***************
*** 7649,7653 ****
      wxPalette * palette = (argCount >= 4 ? (wxPalette *)wxluaT_getuserdatatype(L, 4, wxluatype_wxPalette) : NULL);
      // wxBitmapType type
!     wxBitmapType type = (wxBitmapType)wxlua_getintegertype(L, 3);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 2);
--- 7649,7653 ----
      wxPalette * palette = (argCount >= 4 ? (wxPalette *)wxluaT_getuserdatatype(L, 4, wxluatype_wxPalette) : NULL);
      // wxBitmapType type
!     wxBitmapType type = (wxBitmapType)wxlua_getenumtype(L, 3);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 2);
***************
*** 7954,7958 ****
      int argCount = lua_gettop(L);
      // wxBitmapType type = wxBITMAP_TYPE_ANY
!     wxBitmapType type = (argCount >= 2 ? (wxBitmapType)wxlua_getintegertype(L, 2) : wxBITMAP_TYPE_ANY);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 1);
--- 7954,7958 ----
      int argCount = lua_gettop(L);
      // wxBitmapType type = wxBITMAP_TYPE_ANY
!     wxBitmapType type = (argCount >= 2 ? (wxBitmapType)wxlua_getenumtype(L, 2) : wxBITMAP_TYPE_ANY);
      // const wxString name
      const wxString name = wxlua_getwxStringtype(L, 1);
***************
*** 10141,10145 ****
      int argCount = lua_gettop(L);
      // wxDirection nDirection = wxEAST
!     wxDirection nDirection = (argCount >= 5 ? (wxDirection)wxlua_getintegertype(L, 5) : wxEAST);
      // const wxColour destColour
      const wxColour * destColour = (const wxColour *)wxluaT_getuserdatatype(L, 4, wxluatype_wxColour);
--- 10141,10145 ----
      int argCount = lua_gettop(L);
      // wxDirection nDirection = wxEAST
!     wxDirection nDirection = (argCount >= 5 ? (wxDirection)wxlua_getenumtype(L, 5) : wxEAST);
      // const wxColour destColour
      const wxColour * destColour = (const wxColour *)wxluaT_getuserdatatype(L, 4, wxluatype_wxColour);
***************
*** 10485,10489 ****
  {
      // wxLayoutDirection dir
!     wxLayoutDirection dir = (wxLayoutDirection)wxlua_getintegertype(L, 2);
      // get this
      wxDC * self = (wxDC *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDC);
--- 10485,10489 ----
  {
      // wxLayoutDirection dir
!     wxLayoutDirection dir = (wxLayoutDirection)wxlua_getenumtype(L, 2);
      // get this
      wxDC * self = (wxDC *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDC);
***************
*** 12401,12405 ****
  int wxluatype_wxArrayVideoModes = WXLUA_TUNKNOWN;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Add[] = { &wxluatype_wxArrayVideoModes, &wxluatype_wxVideoMode, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Add(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Add[1] = {{ wxLua_wxArrayVideoModes_Add, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxArrayVideoModes_Add }};
--- 12401,12405 ----
  int wxluatype_wxArrayVideoModes = WXLUA_TUNKNOWN;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Add[] = { &wxluatype_wxArrayVideoModes, &wxluatype_wxVideoMode, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Add(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Add[1] = {{ wxLua_wxArrayVideoModes_Add, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxArrayVideoModes_Add }};
***************
*** 12410,12414 ****
      int argCount = lua_gettop(L);
      // size_t copies = 1
!     size_t copies = (argCount >= 3 ? (size_t)wxlua_getnumbertype(L, 3) : 1);
      // const wxVideoMode vm
      const wxVideoMode * vm = (const wxVideoMode *)wxluaT_getuserdatatype(L, 2, wxluatype_wxVideoMode);
--- 12410,12414 ----
      int argCount = lua_gettop(L);
      // size_t copies = 1
!     size_t copies = (argCount >= 3 ? (size_t)wxlua_getuintegertype(L, 3) : 1);
      // const wxVideoMode vm
      const wxVideoMode * vm = (const wxVideoMode *)wxluaT_getuserdatatype(L, 2, wxluatype_wxVideoMode);
***************
*** 12421,12425 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Alloc[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Alloc(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Alloc[1] = {{ wxLua_wxArrayVideoModes_Alloc, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayVideoModes_Alloc }};
--- 12421,12425 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Alloc[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Alloc(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Alloc[1] = {{ wxLua_wxArrayVideoModes_Alloc, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayVideoModes_Alloc }};
***************
*** 12428,12432 ****
  {
      // size_t nCount
!     size_t nCount = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
--- 12428,12432 ----
  {
      // size_t nCount
!     size_t nCount = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
***************
*** 12481,12485 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Insert[] = { &wxluatype_wxArrayVideoModes, &wxluatype_wxVideoMode, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Insert(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Insert[1] = {{ wxLua_wxArrayVideoModes_Insert, WXLUAMETHOD_METHOD, 3, 4, s_wxluatypeArray_wxLua_wxArrayVideoModes_Insert }};
--- 12481,12485 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Insert[] = { &wxluatype_wxArrayVideoModes, &wxluatype_wxVideoMode, &wxluatype_TNUMBER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Insert(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Insert[1] = {{ wxLua_wxArrayVideoModes_Insert, WXLUAMETHOD_METHOD, 3, 4, s_wxluatypeArray_wxLua_wxArrayVideoModes_Insert }};
***************
*** 12490,12494 ****
      int argCount = lua_gettop(L);
      // size_t copies = 1
!     size_t copies = (argCount >= 4 ? (size_t)wxlua_getnumbertype(L, 4) : 1);
      // int nIndex
      int nIndex = (int)wxlua_getnumbertype(L, 3);
--- 12490,12494 ----
      int argCount = lua_gettop(L);
      // size_t copies = 1
!     size_t copies = (argCount >= 4 ? (size_t)wxlua_getuintegertype(L, 4) : 1);
      // int nIndex
      int nIndex = (int)wxlua_getnumbertype(L, 3);
***************
*** 12519,12523 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Item[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Item(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Item[1] = {{ wxLua_wxArrayVideoModes_Item, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayVideoModes_Item }};
--- 12519,12523 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_Item[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_Item(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_Item[1] = {{ wxLua_wxArrayVideoModes_Item, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayVideoModes_Item }};
***************
*** 12526,12530 ****
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
--- 12526,12530 ----
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
***************
*** 12559,12563 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_RemoveAt[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_RemoveAt(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_RemoveAt[1] = {{ wxLua_wxArrayVideoModes_RemoveAt, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxArrayVideoModes_RemoveAt }};
--- 12559,12563 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_RemoveAt[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TINTEGER, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_RemoveAt(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_RemoveAt[1] = {{ wxLua_wxArrayVideoModes_RemoveAt, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxArrayVideoModes_RemoveAt }};
***************
*** 12568,12574 ****
      int argCount = lua_gettop(L);
      // size_t count = 1
!     size_t count = (argCount >= 3 ? (size_t)wxlua_getnumbertype(L, 3) : 1);
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
--- 12568,12574 ----
      int argCount = lua_gettop(L);
      // size_t count = 1
!     size_t count = (argCount >= 3 ? (size_t)wxlua_getuintegertype(L, 3) : 1);
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
***************
*** 12596,12600 ****
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxArrayVideoModes_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_op_index[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_op_index(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_op_index[1] = {{ wxLua_wxArrayVideoModes_op_index, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayVideoModes_op_index }};
--- 12596,12600 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxArrayVideoModes_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxArrayVideoModes_op_index[] = { &wxluatype_wxArrayVideoModes, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxArrayVideoModes_op_index(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxArrayVideoModes_op_index[1] = {{ wxLua_wxArrayVideoModes_op_index, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxArrayVideoModes_op_index }};
***************
*** 12603,12607 ****
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
--- 12603,12607 ----
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxArrayVideoModes * self = (wxArrayVideoModes *)wxluaT_getuserdatatype(L, 1, wxluatype_wxArrayVideoModes);
***************
*** 12907,12911 ****
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxDisplay_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxDisplay_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxDisplay_constructor[] = { &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxDisplay_constructor(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxDisplay_constructor[1] = {{ wxLua_wxDisplay_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatypeArray_wxLua_wxDisplay_constructor }};
--- 12907,12911 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxDisplay_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxDisplay_delete }};
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxDisplay_constructor[] = { &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxDisplay_constructor(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxDisplay_constructor[1] = {{ wxLua_wxDisplay_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatypeArray_wxLua_wxDisplay_constructor }};
***************
*** 12916,12920 ****
      int argCount = lua_gettop(L);
      // size_t index = 0
!     size_t index = (argCount >= 1 ? (size_t)wxlua_getnumbertype(L, 1) : 0);
      // call constructor
      wxDisplay* returns = new wxDisplay(index);
--- 12916,12920 ----
      int argCount = lua_gettop(L);
      // size_t index = 0
!     size_t index = (argCount >= 1 ? (size_t)wxlua_getuintegertype(L, 1) : 0);
      // call constructor
      wxDisplay* returns = new wxDisplay(index);
***************
*** 13992,13996 ****
      wxHeaderButtonParams * params = (argCount >= 7 ? (wxHeaderButtonParams *)wxluaT_getuserdatatype(L, 7, wxluatype_wxHeaderButtonParams) : NULL);
      // wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE
!     wxHeaderSortIconType sortArrow = (argCount >= 6 ? (wxHeaderSortIconType)wxlua_getintegertype(L, 6) : wxHDR_SORT_ICON_NONE);
      // int flags = 0
      int flags = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0);
--- 13992,13996 ----
      wxHeaderButtonParams * params = (argCount >= 7 ? (wxHeaderButtonParams *)wxluaT_getuserdatatype(L, 7, wxluatype_wxHeaderButtonParams) : NULL);
      // wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE
!     wxHeaderSortIconType sortArrow = (argCount >= 6 ? (wxHeaderSortIconType)wxlua_getenumtype(L, 6) : wxHDR_SORT_ICON_NONE);
      // int flags = 0
      int flags = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0);
***************
*** 14022,14026 ****
      wxHeaderButtonParams * params = (argCount >= 7 ? (wxHeaderButtonParams *)wxluaT_getuserdatatype(L, 7, wxluatype_wxHeaderButtonParams) : NULL);
      // wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE
!     wxHeaderSortIconType sortArrow = (argCount >= 6 ? (wxHeaderSortIconType)wxlua_getintegertype(L, 6) : wxHDR_SORT_ICON_NONE);
      // int flags = 0
      int flags = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0);
--- 14022,14026 ----
      wxHeaderButtonParams * params = (argCount >= 7 ? (wxHeaderButtonParams *)wxluaT_getuserdatatype(L, 7, wxluatype_wxHeaderButtonParams) : NULL);
      // wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE
!     wxHeaderSortIconType sortArrow = (argCount >= 6 ? (wxHeaderSortIconType)wxlua_getenumtype(L, 6) : wxHDR_SORT_ICON_NONE);
      // int flags = 0
      int flags = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0);
***************
*** 14124,14128 ****
      int flags = (argCount >= 7 ? (int)wxlua_getnumbertype(L, 7) : 0);
      // wxOrientation orient
!     wxOrientation orient = (wxOrientation)wxlua_getintegertype(L, 6);
      // wxCoord position
      wxCoord position = (wxCoord)wxlua_getnumbertype(L, 5);
--- 14124,14128 ----
      int flags = (argCount >= 7 ? (int)wxlua_getnumbertype(L, 7) : 0);
      // wxOrientation orient
!     wxOrientation orient = (wxOrientation)wxlua_getenumtype(L, 6);
      // wxCoord position
      wxCoord position = (wxCoord)wxlua_getnumbertype(L, 5);

Index: wxaui_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxaui_bind.cpp	29 Oct 2008 04:44:33 -0000	1.13
--- wxaui_bind.cpp	24 Mar 2009 04:15:12 -0000	1.14
***************
*** 531,535 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Item[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiNotebookPageArray_Item(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Item[1] = {{ wxLua_wxAuiNotebookPageArray_Item, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Item }};
--- 531,535 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Item[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiNotebookPageArray_Item(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Item[1] = {{ wxLua_wxAuiNotebookPageArray_Item, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Item }};
***************
*** 538,542 ****
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxAuiNotebookPageArray * self = (wxAuiNotebookPageArray *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebookPageArray);
--- 538,542 ----
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxAuiNotebookPageArray * self = (wxAuiNotebookPageArray *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebookPageArray);
***************
*** 552,556 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_RemoveAt[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiNotebookPageArray_RemoveAt(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_RemoveAt[1] = {{ wxLua_wxAuiNotebookPageArray_RemoveAt, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_RemoveAt }};
--- 552,556 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_RemoveAt[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiNotebookPageArray_RemoveAt(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_RemoveAt[1] = {{ wxLua_wxAuiNotebookPageArray_RemoveAt, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_RemoveAt }};
***************
*** 559,563 ****
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxAuiNotebookPageArray * self = (wxAuiNotebookPageArray *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebookPageArray);
--- 559,563 ----
  {
      // size_t nIndex
!     size_t nIndex = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxAuiNotebookPageArray * self = (wxAuiNotebookPageArray *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebookPageArray);
***************
*** 1183,1187 ****
  
  #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxPointSizeRect)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabArt_SetSizingInfo[] = { &wxluatype_wxAuiTabArt, &wxluatype_wxSize, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabArt_SetSizingInfo(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabArt_SetSizingInfo[1] = {{ wxLua_wxAuiTabArt_SetSizingInfo, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabArt_SetSizingInfo }};
--- 1183,1187 ----
  
  #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxPointSizeRect)
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabArt_SetSizingInfo[] = { &wxluatype_wxAuiTabArt, &wxluatype_wxSize, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabArt_SetSizingInfo(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabArt_SetSizingInfo[1] = {{ wxLua_wxAuiTabArt_SetSizingInfo, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabArt_SetSizingInfo }};
***************
*** 1190,1194 ****
  {
      // size_t tab_count
!     size_t tab_count = (size_t)wxlua_getnumbertype(L, 3);
      // const wxSize tab_ctrl_size
      const wxSize * tab_ctrl_size = (const wxSize *)wxluaT_getuserdatatype(L, 2, wxluatype_wxSize);
--- 1190,1194 ----
  {
      // size_t tab_count
!     size_t tab_count = (size_t)wxlua_getuintegertype(L, 3);
      // const wxSize tab_ctrl_size
      const wxSize * tab_ctrl_size = (const wxSize *)wxluaT_getuserdatatype(L, 2, wxluatype_wxSize);
***************
*** 1515,1519 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage1[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_GetPage1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_GetPage1[1] = {{ wxLua_wxAuiTabCtrl_GetPage1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage1 }};
--- 1515,1519 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage1[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_GetPage1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_GetPage1[1] = {{ wxLua_wxAuiTabCtrl_GetPage1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage1 }};
***************
*** 1522,1526 ****
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
--- 1522,1526 ----
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
***************
*** 1533,1537 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_GetPage(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_GetPage[1] = {{ wxLua_wxAuiTabCtrl_GetPage, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage }};
--- 1533,1537 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_GetPage(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_GetPage[1] = {{ wxLua_wxAuiTabCtrl_GetPage, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetPage }};
***************
*** 1540,1544 ****
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
--- 1540,1544 ----
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
***************
*** 1599,1603 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetWindowFromIdx[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_GetWindowFromIdx(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_GetWindowFromIdx[1] = {{ wxLua_wxAuiTabCtrl_GetWindowFromIdx, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetWindowFromIdx }};
--- 1599,1603 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetWindowFromIdx[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_GetWindowFromIdx(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_GetWindowFromIdx[1] = {{ wxLua_wxAuiTabCtrl_GetWindowFromIdx, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_GetWindowFromIdx }};
***************
*** 1606,1610 ****
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
--- 1606,1610 ----
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
***************
*** 1617,1621 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_InsertPage[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_wxWindow, &wxluatype_wxAuiNotebookPage, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_InsertPage(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_InsertPage[1] = {{ wxLua_wxAuiTabCtrl_InsertPage, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxAuiTabCtrl_InsertPage }};
--- 1617,1621 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_InsertPage[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_wxWindow, &wxluatype_wxAuiNotebookPage, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_InsertPage(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_InsertPage[1] = {{ wxLua_wxAuiTabCtrl_InsertPage, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxAuiTabCtrl_InsertPage }};
***************
*** 1624,1628 ****
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getnumbertype(L, 4);
      // const wxAuiNotebookPage info
      const wxAuiNotebookPage * info = (const wxAuiNotebookPage *)wxluaT_getuserdatatype(L, 3, wxluatype_wxAuiNotebookPage);
--- 1624,1628 ----
  {
      // size_t idx
!     size_t idx = (size_t)wxlua_getuintegertype(L, 4);
      // const wxAuiNotebookPage info
      const wxAuiNotebookPage * info = (const wxAuiNotebookPage *)wxluaT_getuserdatatype(L, 3, wxluatype_wxAuiNotebookPage);
***************
*** 1707,1711 ****
  #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MovePage[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_wxWindow, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_MovePage(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_MovePage[1] = {{ wxLua_wxAuiTabCtrl_MovePage, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabCtrl_MovePage }};
--- 1707,1711 ----
  #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MovePage[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_wxWindow, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_MovePage(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_MovePage[1] = {{ wxLua_wxAuiTabCtrl_MovePage, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabCtrl_MovePage }};
***************
*** 1714,1718 ****
  {
      // size_t new_idx
!     size_t new_idx = (size_t)wxlua_getnumbertype(L, 3);
      // wxWindow page
      wxWindow * page = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow);
--- 1714,1718 ----
  {
      // size_t new_idx
!     size_t new_idx = (size_t)wxlua_getuintegertype(L, 3);
      // wxWindow page
      wxWindow * page = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow);
***************
*** 1761,1765 ****
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetActivePage1[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_SetActivePage1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_SetActivePage1[1] = {{ wxLua_wxAuiTabCtrl_SetActivePage1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetActivePage1 }};
--- 1761,1765 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetActivePage1[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_SetActivePage1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_SetActivePage1[1] = {{ wxLua_wxAuiTabCtrl_SetActivePage1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetActivePage1 }};
***************
*** 1768,1772 ****
  {
      // size_t page
!     size_t page = (size_t)wxlua_getnumbertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
--- 1768,1772 ----
  {
      // size_t page
!     size_t page = (size_t)wxlua_getuintegertype(L, 2);
      // get this
      wxAuiTabCtrl * self = (wxAuiTabCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiTabCtrl);
***************
*** 1921,1925 ****
  #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont)
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetTabOffset[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_SetTabOffset(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_SetTabOffset[1] = {{ wxLua_wxAuiTabCtrl_SetTabOffset, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetTabOffset }};
--- 1921,1925 ----
  #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont)
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_SetTabOffset[] = { &wxluatype_wxAuiTabCtrl, &wxluatype_TINTEGER, NULL };
  static int LUACALL wxLua_wxAuiTabCtrl_SetTabOffset(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_SetTabOffset[1] = {{ wxLua_wxAuiTabCtrl_SetTabOffset, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiTabCtrl_S...
 
[truncated message content]

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan_bind.h,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10993/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan_bind.h 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxluacan_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxluacan_bind.h	22 Oct 2008 05:31:45 -0000	1.3
--- wxluacan_bind.h	24 Mar 2009 04:15:04 -0000	1.4
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 24
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 24
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 25
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 25
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/src wxlstate.cpp,1.178,1.179

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10993/wxLua/modules/wxlua/src

Modified Files:
	wxlstate.cpp 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** wxlstate.cpp	9 Dec 2008 18:19:24 -0000	1.178
--- wxlstate.cpp	24 Mar 2009 04:15:32 -0000	1.179
***************
*** 1425,1428 ****
--- 1425,1444 ----
      return (num != 0);
  }
+ long LUACALL wxlua_getenumtype(lua_State *L, int stack_idx)
+ {
+     int l_type = lua_type(L, stack_idx);
+ 
+     if (!wxlua_iswxluatype(l_type, WXLUA_TINTEGER))
+         wxlua_argerror(L, stack_idx, wxT("an 'integer enum'"));
+ 
+     // we don't allow bool or round, enums must strictly be integers
+     double value = lua_tonumber(L, stack_idx);
+     long long_value = (long)value;
+ 
+     if (value != long_value)
+         wxlua_argerror(L, stack_idx, wxT("an 'integer enum'"));
+ 
+     return long_value;
+ }
  long LUACALL wxlua_getintegertype(lua_State *L, int stack_idx)
  {
***************
*** 1439,1446 ****
          value = lua_tonumber(L, stack_idx);
  
!     if (value != (long)value)
          wxlua_argerror(L, stack_idx, wxT("an 'integer'"));
  
!     return (long)value;
  }
  double LUACALL wxlua_getnumbertype(lua_State *L, int stack_idx)
--- 1455,1485 ----
          value = lua_tonumber(L, stack_idx);
  
!     long long_value = (long)value;
! 
!     if (value != long_value)
          wxlua_argerror(L, stack_idx, wxT("an 'integer'"));
  
!     return long_value;
! }
! unsigned long LUACALL wxlua_getuintegertype(lua_State *L, int stack_idx)
! {
!     int l_type = lua_type(L, stack_idx);
! 
!     if (!wxlua_iswxluatype(l_type, WXLUA_TINTEGER))
!         wxlua_argerror(L, stack_idx, wxT("an 'unsigned integer'"));
! 
!     double value = 0;
!     // we also allow bool = 1/0 which Lua evaluates to nil in lua_tonumber
!     if (l_type == LUA_TBOOLEAN)
!         value = lua_toboolean(L, stack_idx) ? 1 : 0;
!     else
!         value = lua_tonumber(L, stack_idx);
! 
!     unsigned long ulong_value = (unsigned long)value;
! 
!     if ((value != ulong_value) || (value < 0))
!         wxlua_argerror(L, stack_idx, wxT("an 'unsigned integer'"));
! 
!     return ulong_value;
  }
  double LUACALL wxlua_getnumbertype(lua_State *L, int stack_idx)
***************
*** 4044,4048 ****
  #include <limits.h>
  
! //#include "bit_limits.h" // wxLua: directly include the file here
  #define BITLIB_FLOAT_BITS 53
  #define BITLIB_FLOAT_MAX  0xfffffffffffffL
--- 4083,4087 ----
  #include <limits.h>
  
! //#include "bit_limits.h"
  #define BITLIB_FLOAT_BITS 53
  #define BITLIB_FLOAT_MAX  0xfffffffffffffL
***************
*** 4059,4063 ****
  
  #ifndef SIZE_MAX
! #define SIZE_MAX ((size_t)-1) // wxLua: define this if it's not already
  #endif
  
--- 4098,4102 ----
  
  #ifndef SIZE_MAX
! #define SIZE_MAX ((size_t)-1)
  #endif
  
***************
*** 4086,4090 ****
  
  
! #define BUILTIN_CAST // wxLua: this is probably good enough for us
  
  /* Define TOBIT to get a bit value */
--- 4125,4129 ----
  
  
! #define BUILTIN_CAST
  
  /* Define TOBIT to get a bit value */