[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.88, 1.89 wxlstate.cpp, 1.124, 1.125

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp 
Log Message:
Add the gl lib as a default
fix some bindings that take int *var and return the value


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** wxlstate.cpp	26 Jul 2007 18:56:39 -0000	1.124
--- wxlstate.cpp	1 Aug 2007 03:21:24 -0000	1.125
***************
*** 2667,2671 ****
          if (g_wxluatag_wxLuaFunction == stack_tag)
          {
!             wxLuaFunction *pFunction = (wxLuaFunction *)wxlua_ttouserdata(L, stack_idx);
              return pFunction->GetObject();
          }
--- 2667,2671 ----
          if (g_wxluatag_wxLuaFunction == stack_tag)
          {
!             wxLuaFunction *pFunction = (wxLuaFunction *)wxlua_ttouserdata(L, stack_idx, false);
              return pFunction->GetObject();
          }
***************
*** 2673,2677 ****
              return NULL;
          else if (wxlua_isderivedclass(L, stack_tag, tag) >= 0)
!             return wxlua_ttouserdata(L, stack_idx);
      }
  
--- 2673,2677 ----
              return NULL;
          else if (wxlua_isderivedclass(L, stack_tag, tag) >= 0)
!             return wxlua_ttouserdata(L, stack_idx, false);
      }
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** wxlbind.cpp	26 Jul 2007 18:56:39 -0000	1.88
--- wxlbind.cpp	1 Aug 2007 03:21:24 -0000	1.89
***************
*** 83,89 ****
      //if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction))
      {
!         wxLuaFunction *wxlFunction = (wxLuaFunction *)wxlua_ttouserdata(L, 1, false);
! 
!         return wxlFunction->CallMethod(L);
      }
      return 0;
--- 83,88 ----
      //if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction))
      {
!         wxLuaFunction *f = (wxLuaFunction *)wxlua_ttouserdata(L, 1, false);
!         return f->CallMethod(L);
      }
      return 0;
***************
*** 289,293 ****
      if ((wxlClass != NULL) && wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == *wxlClass->class_tag))
      {
!         void *pObject = wxlua_ttouserdata(L, 1);
          name = lua_tostring(L, 2); // name of the __index method called in lua
  
--- 288,292 ----
      if ((wxlClass != NULL) && wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == *wxlClass->class_tag))
      {
!         void *pObject = wxlua_ttouserdata(L, 1, false);
          name = lua_tostring(L, 2); // name of the __index method called in lua
  
***************
*** 408,412 ****
          if (!found)
          {
!             void *pObject = wxlua_ttouserdata(L, 1);
              wxLuaObject* wxlObj = new wxLuaObject(wxlState, 3);
              wxlua_setderivedmethod(L, pObject, name, wxlObj);
--- 407,411 ----
          if (!found)
          {
!             void *pObject = wxlua_ttouserdata(L, 1, false);
              wxLuaObject* wxlObj = new wxLuaObject(wxlState, 3);
              wxlua_setderivedmethod(L, pObject, name, wxlObj);