[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.119, 1.120 wxlstate.cpp, 1.167, 1.168 wxlua_bind.cpp, 1.23, 1.24

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp wxlua_bind.cpp 
Log Message:
Cleanup the change to using positive wxLua types and the mapping between
the Lua and wxLua types.

Fix wxLuaEdit to not stop at -1 line numbers since that's what Lua gives
when running require("wx").


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** wxlstate.cpp	25 Jan 2008 23:50:53 -0000	1.167
--- wxlstate.cpp	26 Jan 2008 23:27:25 -0000	1.168
***************
*** 992,996 ****
  
      // Check for real type or this is a predefined WXLUA_TXXX type
!     if ((L == NULL) || (wxl_type <= 0))
      {
          switch (wxl_type)
--- 992,996 ----
  
      // Check for real type or this is a predefined WXLUA_TXXX type
!     if ((L == NULL) || (WXLUAT_IS_LUAT(wxl_type)))
      {
          switch (wxl_type)
***************
*** 1014,1020 ****
      else
      {
-         if (wxl_type == wxluatype_NULL) // FIXME NEEDED since there isn't a wxLuaBindClass
-             return wxT("NULL");
- 
          const wxLuaBindClass* wxlClass = wxluaT_getclass(L, wxl_type);
          if (wxlClass)
--- 1014,1017 ----
***************
*** 1022,1026 ****
      }
  
!     return wxEmptyString;
  }
  
--- 1019,1023 ----
      }
  
!     return wxT("Unknown wxLua Type?");
  }
  
***************
*** 1301,1305 ****
  {
      //int wxltype = LUAT_TO_WXLUAT(luatype);
!     //if ((wxltype > WXLUA_T_MAX) || (wxltype < WXLUA_T_MIN))
      //    return WXLUA_TUNKNOWN;
      //return wxltype;
--- 1298,1302 ----
  {
      //int wxltype = LUAT_TO_WXLUAT(luatype);
!     //if (!WXLUAT_IS_LUAT(wxltype))
      //    return WXLUA_TUNKNOWN;
      //return wxltype;

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** wxlbind.cpp	25 Jan 2008 23:50:53 -0000	1.119
--- wxlbind.cpp	26 Jan 2008 23:27:25 -0000	1.120
***************
*** 45,49 ****
  int wxluatype_TCFUNCTION     = WXLUA_TCFUNCTION;
  
! int wxluatype_NULL           = WXLUA_TNULL;
  
  wxLuaBindClass wxLuaBindClass_NULL =
--- 45,49 ----
  int wxluatype_TCFUNCTION     = WXLUA_TCFUNCTION;
  
! int wxluatype_NULL           = WXLUATYPE_NULL;
  
  wxLuaBindClass wxLuaBindClass_NULL =
***************
*** 952,956 ****
  wxLuaBindingList wxLuaBinding::sm_bindingList;
  bool wxLuaBinding::sm_bindingList_initialized = false;
! int wxLuaBinding::sm_wxluatype_max = WXLUA_TNULL; // highest wxLua type initially
  
  wxLuaBinding::wxLuaBinding()
--- 952,956 ----
  wxLuaBindingList wxLuaBinding::sm_bindingList;
  bool wxLuaBinding::sm_bindingList_initialized = false;
! int wxLuaBinding::sm_wxluatype_max = WXLUA_T_MAX+1; // highest wxLua type initially
  
  wxLuaBinding::wxLuaBinding()

Index: wxlua_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wxlua_bind.cpp	25 Jan 2008 23:50:54 -0000	1.23
--- wxlua_bind.cpp	26 Jan 2008 23:27:25 -0000	1.24
***************
*** 74,78 ****
          { "WXLUA_TNIL", WXLUA_TNIL },
          { "WXLUA_TNONE", WXLUA_TNONE },
-         { "WXLUA_TNULL", WXLUA_TNULL },
          { "WXLUA_TNUMBER", WXLUA_TNUMBER },
          { "WXLUA_TSTRING", WXLUA_TSTRING },
--- 74,77 ----