[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp,1.131,1.132

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory vz-cvs-4.sog:/tmp/cvs-serv7280/modules/wxlua/src

Modified Files:
	wxlbind.cpp 
Log Message:
Speedup complilation with Makefiles by exporting values to sub Makefiles
some cleanup in wxlbind.cpp


Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** wxlbind.cpp	27 Apr 2011 03:39:22 -0000	1.131
--- wxlbind.cpp	30 Apr 2011 16:48:28 -0000	1.132
***************
*** 88,93 ****
          m_reference = LUA_NOREF;
      }
!     else if (!m_wxlState->IsClosing())
!         wxPrintf(wxT("~wxLuaObject %d %d %d\n"), (int)m_reference, (int)m_wxlState->Ok(), (int)m_wxlState->IsClosing());
  
      if (m_alloc_flag == wxLUAOBJECT_STRING)
--- 88,93 ----
          m_reference = LUA_NOREF;
      }
!     //else if (!m_wxlState->IsClosing())
!     //    wxPrintf(wxT("~wxLuaObject %d %d %d\n"), (int)m_reference, (int)m_wxlState->Ok(), (int)m_wxlState->IsClosing());
  
      if (m_alloc_flag == wxLUAOBJECT_STRING)
***************
*** 362,366 ****
  int LUACALL wxlua_wxLuaBindClass__index(lua_State *L)
  {
!     // This function is called for the __index metable of the wxLua userdata
      // for class instances.
  
--- 362,366 ----
  int LUACALL wxlua_wxLuaBindClass__index(lua_State *L)
  {
!     // This function is called for the __index metatable of the wxLua userdata
      // for class instances.
  
***************
*** 410,414 ****
              wxLuaBindMethod* wxlMethod = wxLuaBinding::GetClassMethod(wxlClass, name, WXLUAMETHOD_METHOD|WXLUAMETHOD_GETPROP, true);
  
!             if (wxlMethod != NULL)
              {
                  if (WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_GETPROP))
--- 410,414 ----
              wxLuaBindMethod* wxlMethod = wxLuaBinding::GetClassMethod(wxlClass, name, WXLUAMETHOD_METHOD|WXLUAMETHOD_GETPROP, true);
  
!             if ((wxlMethod != NULL) && (wxlMethod->wxluacfuncs != NULL))
              {
                  if (WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_GETPROP))
***************
*** 516,523 ****
              (*wxlMethod->wxluacfuncs[0].lua_cfunc)(L);
          }
! 
!         // Maybe this is an undeclared property? Prepend 'Set' and try again.
!         if (!found)
          {
              int len = strlen(name);
              wxCharBuffer buf(len + 4);
--- 516,522 ----
              (*wxlMethod->wxluacfuncs[0].lua_cfunc)(L);
          }
!         else
          {
+             // Maybe this is an undeclared property? Prepend 'Set' and try again.
              int len = strlen(name);
              wxCharBuffer buf(len + 4);