[Wxlua-commit] wxLua/modules/wxlua/src wxlstate.cpp,1.62,1.63

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

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

Modified Files:
	wxlstate.cpp 
Log Message:
rename coroutine tracking functions luaX_ to wxLua_lua_ to make them more obvious
slight cleanup otherwise


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** wxlstate.cpp	2 May 2006 05:25:06 -0000	1.62
--- wxlstate.cpp	2 May 2006 22:46:53 -0000	1.63
***************
*** 131,138 ****
  static void wxLuaState_SetupThreadHandlers()
  {
!     if (luaX_getnewthreadhandler() == NULL)
!         luaX_setnewthreadhandler( wxLuaState_newthread_handler );
!     if (luaX_getfreethreadhandler() == NULL)
!         luaX_setfreethreadhandler( wxLuaState_freethread_handler );
  }
  
--- 131,138 ----
  static void wxLuaState_SetupThreadHandlers()
  {
!     if (wxLua_lua_getnewthreadhandler() == NULL)
!         wxLua_lua_setnewthreadhandler( wxLuaState_newthread_handler );
!     if (wxLua_lua_getfreethreadhandler() == NULL)
!         wxLua_lua_setfreethreadhandler( wxLuaState_freethread_handler );
  }
  
***************
*** 1983,1990 ****
      if (data != NULL)
      {
          // if the object we are referencing is derived from wxWindow
          if (IsDerivedClass(iTag, GetwxWindowTag())) // s_wxluatag_wxWindow
          {
!             wxWindow *win = wxDynamicCast(data, wxWindow);
              if (win != NULL)
              {
--- 1983,1992 ----
      if (data != NULL)
      {
+         wxWindow *win = NULL;
+ 
          // if the object we are referencing is derived from wxWindow
          if (IsDerivedClass(iTag, GetwxWindowTag())) // s_wxluatag_wxWindow
          {
!             win = wxDynamicCast(data, wxWindow);
              if (win != NULL)
              {
***************
*** 1999,2013 ****
                  }
              }
-             else
-             {
-                 // Otherwise handle normally
-                 tpushusertag(data, iTag);
-             }
          }
!         else
!         {
!             // Otherwise handle normally
              tpushusertag(data, iTag);
!         }
      }
      else
--- 2001,2010 ----
                  }
              }
          }
! 
!         // Otherwise handle normally
!         if (win == NULL)
              tpushusertag(data, iTag);
! 
      }
      else