[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket.cpp, 1.14, 1.15

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

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

Modified Files:
	wxluasocket.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: wxluasocket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxluasocket.cpp	7 Feb 2007 18:39:12 -0000	1.14
--- wxluasocket.cpp	22 Feb 2007 00:01:36 -0000	1.15
***************
*** 99,103 ****
      int lineNumber = (int)wxlState.GetNumberType(3);
      // const wxString fileName
!     const wxString fileName = lua2wx(wxlState.GetStringType(2));
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
--- 99,103 ----
      int lineNumber = (int)wxlState.GetNumberType(3);
      // const wxString fileName
!     const wxString fileName = wxlState.GetwxStringType(2);
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
***************
*** 119,123 ****
      int lineNumber = (int)wxlState.GetNumberType(3);
      // const wxString fileName
!     const wxString fileName = lua2wx(wxlState.GetStringType(2));
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
--- 119,123 ----
      int lineNumber = (int)wxlState.GetNumberType(3);
      // const wxString fileName
!     const wxString fileName = wxlState.GetwxStringType(2);
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
***************
*** 152,158 ****
      bool returns;
      // const wxString fileName
!     const wxString fileName = lua2wx(wxlState.GetStringType(3));
      // const wxString file
!     const wxString file = lua2wx(wxlState.GetStringType(2));
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
--- 152,158 ----
      bool returns;
      // const wxString fileName
!     const wxString fileName = wxlState.GetwxStringType(3);
      // const wxString file
!     const wxString file = wxlState.GetwxStringType(2);
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer);
***************
*** 262,266 ****
      bool returns;
      // const wxString expr
!     const wxString expr = lua2wx(wxlState.GetStringType(3));
      // int exprRef
      int exprRef = (int)wxlState.GetNumberType(2);
--- 262,266 ----
      bool returns;
      // const wxString expr
!     const wxString expr = wxlState.GetwxStringType(3);
      // int exprRef
      int exprRef = (int)wxlState.GetNumberType(2);