[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.71, 1.72 wxlstate.cpp, 1.107, 1.108

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp 
Log Message:
Fix wxLuaBinding::GetClassMethod to not always return the baseclass
Fix CreateArgTagsMessage to use the correct method->funcs_n


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** wxlstate.cpp	12 Jun 2007 00:08:42 -0000	1.107
--- wxlstate.cpp	12 Jun 2007 13:19:37 -0000	1.108
***************
*** 904,908 ****
  //----------------------------------------------------------------------------
  
! wxLuaStateData::wxLuaStateData() 
                 :m_bindings_registered(false),
                  m_wxluatag_wxLuaFunction(0),
--- 904,908 ----
  //----------------------------------------------------------------------------
  
! wxLuaStateData::wxLuaStateData()
                 :m_bindings_registered(false),
                  m_wxluatag_wxLuaFunction(0),
***************
*** 973,977 ****
  wxHashMapLuaStateRefData wxLuaStateRefData::s_wxHashMapLuaStateRefData;
  
! wxLuaStateRefData::wxLuaStateRefData(bool create_data) 
                    :m_lua_State(NULL),
                     m_lua_State_static(false),
--- 973,977 ----
  wxHashMapLuaStateRefData wxLuaStateRefData::s_wxHashMapLuaStateRefData;
  
! wxLuaStateRefData::wxLuaStateRefData(bool create_data)
                    :m_lua_State(NULL),
                     m_lua_State_static(false),
***************
*** 1059,1063 ****
      }
  
!     // Clear these after closing lua for gc to run 
      m_wxlStateData->m_callbackList.Clear();
      m_wxlStateData->m_winDestroyCallbackList.Clear();
--- 1059,1063 ----
      }
  
!     // Clear these after closing lua for gc to run
      m_wxlStateData->m_callbackList.Clear();
      m_wxlStateData->m_winDestroyCallbackList.Clear();
***************
*** 1193,1197 ****
      lua_pushlightuserdata( L, (void*)m_refData );
      lua_rawset( L, LUA_REGISTRYINDEX ); // set the value
!  
      // register handlers to send events
      RegisterFunction(wxlua_printFunction, "print");
--- 1193,1197 ----
      lua_pushlightuserdata( L, (void*)m_refData );
      lua_rawset( L, LUA_REGISTRYINDEX ); // set the value
! 
      // register handlers to send events
      RegisterFunction(wxlua_printFunction, "print");
***************
*** 1692,1696 ****
      lua_State* L = M_WXLSTATEDATA->m_lua_State;
  
!     // Stick us into the lua_State - push key, value 
      // make sure we're there, even though we might have already done this.
      wxlua_pushstring_wxLuaStateRefData(L);
--- 1692,1696 ----
      lua_State* L = M_WXLSTATEDATA->m_lua_State;
  
!     // Stick us into the lua_State - push key, value
      // make sure we're there, even though we might have already done this.
      wxlua_pushstring_wxLuaStateRefData(L);
***************
*** 1785,1789 ****
      lua_State* L = M_WXLSTATEDATA->m_lua_State;
      const wxLuaBindClass* wxlClass = wxlua_tgetclass(L, class_tag);
!     
      // we shouldn't ever need this code
      if (wxlClass == NULL)
--- 1785,1789 ----
      lua_State* L = M_WXLSTATEDATA->m_lua_State;
      const wxLuaBindClass* wxlClass = wxlua_tgetclass(L, class_tag);
! 
      // we shouldn't ever need this code
      if (wxlClass == NULL)
***************
*** 3463,3467 ****
      {
          wxLuaBindCFunc* funcs = method->funcs;
!         int i, arg, funcs_count = wxlMethod->funcs_n;
          wxString className;
  
--- 3463,3467 ----
      {
          wxLuaBindCFunc* funcs = method->funcs;
!         int i, arg, funcs_count = method->funcs_n;
          wxString className;
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** wxlbind.cpp	12 Jun 2007 05:03:17 -0000	1.71
--- wxlbind.cpp	12 Jun 2007 13:19:37 -0000	1.72
***************
*** 1066,1072 ****
  
      if (search_baseclasses && wxlClass->baseclass)
!         wxlMethod = GetClassMethod(wxlClass->baseclass, methodName, search_baseclasses);
  
!     return wxlMethod;
  }
  
--- 1066,1072 ----
  
      if (search_baseclasses && wxlClass->baseclass)
!         return GetClassMethod(wxlClass->baseclass, methodName, search_baseclasses);
  
!     return NULL;
  }