[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp,1.73,1.74

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9645/wxLua/modules/wxlua/src

Modified Files:
	wxlbind.cpp 
Log Message:
Remove class member functions that are duplicates of their baseclass functions
Fix wxClassInfo is NOT a wxObject
Add more capability to bindings.wx.lua


Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** wxlbind.cpp	13 Jun 2007 00:09:04 -0000	1.73
--- wxlbind.cpp	13 Jun 2007 04:15:29 -0000	1.74
***************
*** 529,533 ****
      {
          qsort(m_classArray, m_classCount, sizeof(wxLuaBindClass), wxLuaBindClassArrayCompareFn);
!        
          wxLuaBindClass* wxlClass = m_classArray;
          for (size_t i = 0; i < m_classCount; ++i, ++wxlClass)
--- 529,533 ----
      {
          qsort(m_classArray, m_classCount, sizeof(wxLuaBindClass), wxLuaBindClassArrayCompareFn);
! 
          wxLuaBindClass* wxlClass = m_classArray;
          for (size_t i = 0; i < m_classCount; ++i, ++wxlClass)
***************
*** 1058,1066 ****
                      if (baseMethod)
                      {
!                         parentMethod->basemethod = baseMethod;
!                         parentMethod = baseMethod;
  
                          // we have already checked the base classes below this
!                         if (WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_OVERLOAD_BASE|WXLUAMETHOD_DELETE))
                              break;
                      }
--- 1058,1069 ----
                      if (baseMethod)
                      {
!                         if (!WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_DELETE))
!                         {
!                             parentMethod->basemethod = baseMethod;
!                             parentMethod = baseMethod;
!                         }
  
                          // we have already checked the base classes below this
!                         if (WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_OVERLOAD_BASE))
                              break;
                      }