[Wxlua-commit] wxLua/bindings/wxwidgets data.i, 1.25, 1.26 windows.i, 1.32, 1.33 wx_datatypes.lua, 1.59, 1.60

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/bindings/wxwidgets

Modified Files:
	data.i windows.i wx_datatypes.lua 
Log Message:
use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** windows.i	14 Mar 2007 05:08:09 -0000	1.32
--- windows.i	19 Mar 2007 03:47:18 -0000	1.33
***************
*** 300,304 ****
  // wxWindowList
  
! %if wxLUA_USE_wxWindowList
  
  %class %noclassinfo wxWindowList, wxList
--- 300,304 ----
  // wxWindowList
  
! %if wxLUA_USE_wxWindowList & !wxUSE_STL
  
  %class %noclassinfo wxWindowList, wxList
***************
*** 315,319 ****
  %endclass
  
! %endif //wxLUA_USE_wxWindowList
  
  //-----------------------------------------------------------------------------
--- 315,319 ----
  %endclass
  
! %endif //wxLUA_USE_wxWindowList & !wxUSE_STL
  
  //-----------------------------------------------------------------------------

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** wx_datatypes.lua	17 Mar 2007 19:08:09 -0000	1.59
--- wx_datatypes.lua	19 Mar 2007 03:47:18 -0000	1.60
***************
*** 1868,1872 ****
    },
    wxKeyType = {
!     Condition = "wxLUA_USE_wxList",
      DefType = "enum",
      IsNumber = true,
--- 1868,1872 ----
    },
    wxKeyType = {
!     Condition = "wxLUA_USE_wxList && !wxUSE_STL",
      DefType = "enum",
      IsNumber = true,
***************
*** 1925,1929 ****
    wxList = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxList",
      DefType = "class",
      IsNumber = false,
--- 1925,1929 ----
    wxList = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxList && !wxUSE_STL",
      DefType = "class",
      IsNumber = false,
***************
*** 2314,2318 ****
    },
    wxNode = {
!     Condition = "wxLUA_USE_wxList",
      DefType = "class",
      IsNumber = false,
--- 2314,2318 ----
    },
    wxNode = {
!     Condition = "wxLUA_USE_wxList && !wxUSE_STL",
      DefType = "class",
      IsNumber = false,
***************
*** 3550,3554 ****
    wxWindowList = {
      BaseClass = "wxList",
!     Condition = "wxLUA_USE_wxWindowList",
      DefType = "class",
      IsNumber = false,
--- 3550,3554 ----
    wxWindowList = {
      BaseClass = "wxList",
!     Condition = "wxLUA_USE_wxWindowList && !wxUSE_STL",
      DefType = "class",
      IsNumber = false,

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** data.i	13 Mar 2007 23:01:53 -0000	1.25
--- data.i	19 Mar 2007 03:47:18 -0000	1.26
***************
*** 184,188 ****
  // wxList
  
! %if wxLUA_USE_wxList
  
  %include "wx/list.h"
--- 184,188 ----
  // wxList
  
! %if wxLUA_USE_wxList & !wxUSE_STL
  
  %include "wx/list.h"
***************
*** 240,244 ****
  %endclass
  
! %endif //wxLUA_USE_wxList
  
  //-----------------------------------------------------------------------------
--- 240,244 ----
  %endclass
  
! %endif //wxLUA_USE_wxList & !wxUSE_STL
  
  //-----------------------------------------------------------------------------