wxlua-commit

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

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

Modified Files:
	controls.wx.lua 
Log Message:
Fix multiple inheritance by adding the offset to the vtable for
base classes that are second or higher.


Index: controls.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** controls.wx.lua	24 Jan 2008 00:18:19 -0000	1.18
--- controls.wx.lua	25 Sep 2009 18:47:58 -0000	1.19
***************
*** 369,378 ****
              s = s.."\n\t"..evtClassName.." - "..wxEvent_GetFuncs[evtClassName](event)
          end
!         evtClassName = wxCLASS_TableByName[evtClassName].baseclassName
      end
  
      -- for debugging, this means we need to add it to the wxEvent_GetFuncs table
      if evtClassName ~= "wxObject" then
!         print("Unhandled wxEventXXX type in OnEvent:", evtClassName)
      end
  
--- 369,378 ----
              s = s.."\n\t"..evtClassName.." - "..wxEvent_GetFuncs[evtClassName](event)
          end
!         evtClassName = wxCLASS_TableByName[evtClassName].baseclassNames[1]
      end
  
      -- for debugging, this means we need to add it to the wxEvent_GetFuncs table
      if evtClassName ~= "wxObject" then
!         print("Unhandled wxEventXXX type in OnEvent:", evtClassName, evtTypeStr)
      end
  
***************
*** 860,864 ****
                              wx.wxTR_HAS_BUTTONS+wx.wxTR_MULTIPLE)
      control:SetImageList(imageList)
!     local item = control:AddRoot("Root Note", 0)
      control:AppendItem(item, "Item 1", 1)
      control:AppendItem(item, "Item 2")
--- 860,864 ----
                              wx.wxTR_HAS_BUTTONS+wx.wxTR_MULTIPLE)
      control:SetImageList(imageList)
!     local item = control:AddRoot("Root Node", 0)
      control:AppendItem(item, "Item 1", 1)
      control:AppendItem(item, "Item 2")