wxlua-commit

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan.cpp wxluacan_bind.cpp 
Log Message:
use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0


Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** wxluacan.cpp	15 Mar 2007 23:24:48 -0000	1.24
--- wxluacan.cpp	19 Mar 2007 03:47:17 -0000	1.25
***************
*** 176,182 ****
      { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos },
      { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor },
  };
  
! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]);
  
  // ---------------------------------------------------------------------------
--- 176,183 ----
      { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos },
      { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1;
  
  // ---------------------------------------------------------------------------
***************
*** 214,220 ****
  WXLUAMETHOD wxlCanObjRect_methods[] = {
      { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor },
  };
  
! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]);
  
  // ---------------------------------------------------------------------------
--- 215,222 ----
  WXLUAMETHOD wxlCanObjRect_methods[] = {
      { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1;
  
  // ---------------------------------------------------------------------------
***************
*** 250,256 ****
  WXLUAMETHOD wxlCanObjCircle_methods[] = {
      { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor },
  };
  
! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]);
  
  // ---------------------------------------------------------------------------
--- 252,259 ----
  WXLUAMETHOD wxlCanObjCircle_methods[] = {
      { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1;
  
  // ---------------------------------------------------------------------------
***************
*** 286,292 ****
  WXLUAMETHOD wxlCanObjScript_methods[] = {
      { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor },
  };
  
! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]);
  
  // ---------------------------------------------------------------------------
--- 289,296 ----
  WXLUAMETHOD wxlCanObjScript_methods[] = {
      { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1;
  
  // ---------------------------------------------------------------------------
***************
*** 338,344 ****
      { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript },
      { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor },
  };
  
! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]);
  
  // ---------------------------------------------------------------------------
--- 342,349 ----
      { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript },
      { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1;
  
  // ---------------------------------------------------------------------------
***************
*** 434,440 ****
  #endif // wxLUA_USE_wxPointSizeRect
  
  };
  
! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]);
  
  // ---------------------------------------------------------------------------
--- 439,446 ----
  #endif // wxLUA_USE_wxPointSizeRect
  
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1;
  
  // ---------------------------------------------------------------------------
***************
*** 490,495 ****
      { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject },
      { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor },
  };
  
! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]);
  
--- 496,502 ----
      { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject },
      { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1;
  

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxluacan_bind.cpp	15 Mar 2007 23:24:49 -0000	1.16
--- wxluacan_bind.cpp	19 Mar 2007 03:47:17 -0000	1.17
***************
*** 210,214 ****
  {
      static wxLuaBinding_wxluacan m_binding;
!     wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding);
      if (node && (node->GetData() == &m_binding))
          return false;
--- 210,214 ----
  {
      static wxLuaBinding_wxluacan m_binding;
!     wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding);
      if (node && (node->GetData() == &m_binding))
          return false;