[Wxlua-commit] wxLua/bindings/wxwidgets data.i,1.15,1.16 override.hpp,1.41,1.42 wx_datatypes.lua,1.31,1.32 wxlua.i,1.15,1.16

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

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

Modified Files:
	data.i override.hpp wx_datatypes.lua wxlua.i 
Log Message:
move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings
fix using more than two bindings with same namespace


Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wx_datatypes.lua	18 May 2006 05:47:39 -0000	1.31
--- wx_datatypes.lua	24 May 2006 04:50:00 -0000	1.32
***************
*** 1718,1740 ****
      Name = "wxLog",
    },
-   wxLuaDebugData = {
-     Condition = "wxLUA_USE_wxLuaDebugServer",
-     DefType = "class",
-     Intrinsic = false,
-     Name = "wxLuaDebugData",
-   },
-   wxLuaDebugEvent = {
-     BaseClass = "wxEvent",
-     Condition = "wxLUA_USE_wxLuaDebugServer",
-     DefType = "class",
-     Intrinsic = false,
-     Name = "wxLuaDebugEvent",
-   },
-   wxLuaDebugServer = {
-     Condition = "wxLUA_USE_wxLuaDebugServer",
-     DefType = "class",
-     Intrinsic = false,
-     Name = "wxLuaDebugServer",
-   },
    wxLuaHtmlWinTagEvent = {
      BaseClass = "wxEvent",
--- 1718,1721 ----
***************
*** 3254,3258 ****
    wxLUA_USE_wxListBox = "wxLUA_USE_wxListBox",
    wxLUA_USE_wxListCtrl = "wxLUA_USE_wxListCtrl",
-   wxLUA_USE_wxLuaDebugServer = "wxLUA_USE_wxLuaDebugServer",
    wxLUA_USE_wxLuaHtmlWindow = "wxLUA_USE_wxLuaHtmlWindow",
    wxLUA_USE_wxLuaPrintout = "wxLUA_USE_wxLuaPrintout",
--- 3235,3238 ----
***************
*** 3290,3294 ****
    wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar",
    wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList",
-   wxLUA_USE_wxStyledTextCtrl = "wxLUA_USE_wxStyledTextCtrl",
    wxLUA_USE_wxSystemSettings = "wxLUA_USE_wxSystemSettings",
    wxLUA_USE_wxTabCtrl = "wxLUA_USE_wxTabCtrl",
--- 3270,3273 ----

Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxlua.i	17 May 2006 05:02:05 -0000	1.15
--- wxlua.i	24 May 2006 04:50:00 -0000	1.16
***************
*** 33,92 ****
  
  //-----------------------------------------------------------------------------
- // wxLuaDebugServer
- 
- %if wxLUA_USE_wxLuaDebugServer
- 
- %include "wxluasocket/include/wxldserv.h"
- 
- %class %delete %noclassinfo wxLuaDebugServer
-     wxLuaDebugServer(int portNumber)
-     %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName)
- 
-     bool StartClient()
-     bool StartServerThread()
-     bool AddBreakPoint(const wxString &fileName, int lineNumber)
-     bool RemoveBreakPoint(const wxString &fileName, int lineNumber)
-     bool ClearAllBreakPoints()
-     bool Run(const wxString &file, const wxString &fileName)
-     bool Step()
-     bool StepOver()
-     bool StepOut()
-     bool Continue()
-     bool Break()
-     bool Reset()
-     void DisplayStackDialog(wxWindow *pParent)
-     bool EvaluateExpr(int exprRef, const wxString &expr)
- %endclass
- 
- //-----------------------------------------------------------------------------
- // wxLuaDebugData
- 
- %class %noclassinfo wxLuaDebugData
- %endclass
- 
- //-----------------------------------------------------------------------------
- // wxLuaDebugEvent
- 
- %class %delete wxLuaDebugEvent, wxEvent
-     %define %event wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED
-     %define %event wxEVT_WXLUA_DEBUG_BREAK
-     %define %event wxEVT_WXLUA_DEBUG_PRINT
-     %define %event wxEVT_WXLUA_DEBUG_ERROR
-     %define %event wxEVT_WXLUA_DEBUG_EXIT
-     %define %event wxEVT_WXLUA_DEBUG_STACK_ENUM
-     %define %event wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM
-     %define %event wxEVT_WXLUA_DEBUG_TABLE_ENUM
-     %define %event wxEVT_WXLUA_DEBUG_EVALUATE_EXPR
- 
-     int GetLineNumber() const
-     int GetReference() const
-     wxString GetFileName() const
-     wxString GetMessage() const
-     const wxLuaDebugData *GetDebugData() const
- %endclass
- 
- %endif wxLUA_USE_wxLuaDebugServer
- 
- //-----------------------------------------------------------------------------
  // wxLuaPrintout
  
--- 33,36 ----

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** override.hpp	18 May 2006 05:47:39 -0000	1.41
--- override.hpp	24 May 2006 04:50:00 -0000	1.42
***************
*** 974,977 ****
--- 974,998 ----
  // ----------------------------------------------------------------------------
  
+ %override wxLua_wxString_constructor
+ //     wxString(const wxString& str = "")
+ static int LUACALL wxLua_wxString_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxString* returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxString str = ""
+     const wxString str = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxEmptyString));
+     // call constructor
+     returns = new wxString(str);
+     // add to tracked memory list
+     wxLua_AddToTrackedMemoryList(wxlState, returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxString, returns);
+ 
+     return 1;
+ }
+ %end
+ 
  %override wxLua_wxClassInfo_constructor
  // wxClassInfo(const wxString &name)
***************
*** 4236,4257 ****
  %end
  
- %override wxLua_wxLuaDebugServerCompile_constructor
- // %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName)
- static int LUACALL wxLua_wxLuaDebugServerCompile_constructor(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // const wxString &fileName
-     wxString fileName = lua2wx(wxlState.GetStringType(2));
-     // const wxString &buffer
-     wxString buffer = lua2wx(wxlState.GetStringType(1));
-     // compile the file
-     bool fResult = wxLuaDebugServer::Compile(buffer, fileName);
-     // push result
-     lua_pushboolean(L, fResult);
-     // return the number of parameters
-     return 1;
- }
- %end
- 
  %override wxLua_wxLuaPrintout_constructor
  //     wxLuaPrintout(const wxString& title = "Printout", wxLuaObject *pObject = NULL)
--- 4257,4260 ----

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** data.i	18 May 2006 05:47:39 -0000	1.15
--- data.i	24 May 2006 04:50:00 -0000	1.16
***************
*** 9,12 ****
--- 9,22 ----
  
  //-----------------------------------------------------------------------------
+ // wxString - a stub class for people who need wxString (wxLua uses lua strings)
+ 
+ %class %noclassinfo %encapsulate wxString
+     wxString(const wxString& str = "")
+ 
+     wxString GetData() const
+ 
+ %endclass
+ 
+ //-----------------------------------------------------------------------------
  // wxClientData