[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp,1.19,1.20

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

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

Modified Files:
	wxluacan.cpp 
Log Message:
Added wxLuaState::GetwxStringType who's input is either a lua string or a wxString userdata
Use it in bindings instead of GetStringType
wxNode::IndexOf is now protected in wxWidgets 2.8 so remove it


Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxluacan.cpp	7 Feb 2007 18:39:06 -0000	1.19
--- wxluacan.cpp	22 Feb 2007 00:01:33 -0000	1.20
***************
*** 286,290 ****
      wxlCanObjScript *returns;
      // const wxString name
!     const wxString name = lua2wx(wxlState.GetStringType(3));
      // double y
      double y = (double)wxlState.GetNumberType(2);
--- 286,290 ----
      wxlCanObjScript *returns;
      // const wxString name
!     const wxString name = wxlState.GetwxStringType(3);
      // double y
      double y = (double)wxlState.GetNumberType(2);
***************
*** 328,332 ****
      wxlCanObjAddScript *returns;
      // const wxString script
!     const wxString script = lua2wx(wxlState.GetStringType(3));
      // double y
      double y = (double)wxlState.GetNumberType(2);
--- 328,332 ----
      wxlCanObjAddScript *returns;
      // const wxString script
!     const wxString script = wxlState.GetwxStringType(3);
      // double y
      double y = (double)wxlState.GetNumberType(2);
***************
*** 347,351 ****
      wxLuaState wxlState(L);
      // const wxString script
!     const wxString script = lua2wx(wxlState.GetStringType(2));
      // get this
      wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript);
--- 347,351 ----
      wxLuaState wxlState(L);
      // const wxString script
!     const wxString script = wxlState.GetwxStringType(2);
      // get this
      wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript);