[Wxlua-commit] wxLua/bindings/wxluasocket Makefile, 1.3, 1.4 override.hpp, 1.4, 1.5 wxluasocket.i, 1.11, 1.12 wxluasocket_rules.lua, 1.4, 1.5

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

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

Modified Files:
	Makefile override.hpp wxluasocket.i wxluasocket_rules.lua 
Log Message:
Changed the Delete() function from the %delete tag for classes to just
   delete() to avoid any future name clashes since delete() is never allowed
   to be a function name in C++.
Moved the wxStyledTextCtrl class and it's 1268 defines into the wxstc table.
Moved wxLuaObject, wxLuaDebugger (and friends) into the wxlua table and
   added more functions for inspecting userdata and the bindings.
Fix mismatches between the bindings base classes and what they really are.


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	31 May 2007 17:18:45 -0000	1.3
--- Makefile	14 Jun 2007 01:23:07 -0000	1.4
***************
*** 11,18 ****
  WXLUA_DIR = ../..
  
- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst
- THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS))
- #DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxluasocket/override.hpp # $(THEWRAPPERS)
- 
  all: genwxbind
  
--- 11,14 ----

Index: wxluasocket_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket_rules.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxluasocket_rules.lua	9 Jun 2006 03:24:49 -0000	1.4
--- wxluasocket_rules.lua	14 Jun 2007 01:23:07 -0000	1.5
***************
*** 11,15 ****
  -- Set the lua namespace (lua table) that the bindings will be placed into.
  --   eg. wx.wxWindow(...)
! hook_lua_namespace = "wx"
  
  -- Set the C++ "namespace" that the bindings will be placed.
--- 11,15 ----
  -- Set the lua namespace (lua table) that the bindings will be placed into.
  --   eg. wx.wxWindow(...)
! hook_lua_namespace = "wxlua"
  
  -- Set the C++ "namespace" that the bindings will be placed.
***************
*** 135,139 ****
  -------------------------------------------------------------------------------
  -- Add additional data types here
! -- example: dataTypes["wxArrayInt"] = AllocDataType("wxArrayInt", "class",false)
  
  --=============================================================================
--- 135,139 ----
  -------------------------------------------------------------------------------
  -- Add additional data types here
! -- example: AllocDataType("wxArrayInt", "class",false)
  
  --=============================================================================

Index: wxluasocket.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxluasocket.i	11 Jun 2007 03:57:58 -0000	1.11
--- wxluasocket.i	14 Jun 2007 01:23:07 -0000	1.12
***************
*** 14,17 ****
--- 14,24 ----
  %include "wxlua/include/wxlbind.h"
  
+ 
+ // Show a dialog of the current stack and all of the global data in a wxListCtrl
+ // This also shows information about the number and kind of userdata items that
+ // wxLua is tracking and will delete.
+ // %override void StackDialog()
+ %function void LuaStackDialog()
+ 
  //-----------------------------------------------------------------------------
  // wxLuaDebugServer

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/override.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** override.hpp	28 Sep 2006 22:26:02 -0000	1.4
--- override.hpp	14 Jun 2007 01:23:07 -0000	1.5
***************
*** 0 ****
--- 1,23 ----
+ // ----------------------------------------------------------------------------
+ // Overridden functions for the wxLuaSocket binding for wxLua
+ //
+ // Please keep these functions in the same order as the .i file and in the
+ // same order as the listing of the functions in that file.
+ // ----------------------------------------------------------------------------
+ 
+ // ----------------------------------------------------------------------------
+ // Overrides for wxluasocket.i
+ // ----------------------------------------------------------------------------
+ 
+ %override wxLua_function_LuaStackDialog
+ // %function void LuaStackDialog()
+ static int LUACALL wxLua_function_LuaStackDialog(lua_State *L)
+ {
+     // call StackDialog
+ 
+     wxLuaStackDialog stackDialog(wxLuaState(L), NULL);
+     stackDialog.ShowModal();
+ 
+     return 0;
+ }
+ %end