[Wxlua-commit] wxLua/apps/wxluacan/src cansim.cpp, 1.11, 1.12 wxluacan.h, 1.29, 1.30 wxluacan_rules.lua, 1.12, 1.13

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

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

Modified Files:
	cansim.cpp wxluacan.h wxluacan_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: cansim.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/cansim.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** cansim.cpp	17 Dec 2006 10:47:07 -0000	1.11
--- cansim.cpp	14 Jun 2007 01:23:06 -0000	1.12
***************
*** 29,32 ****
--- 29,33 ----
  // Declare the binding initialization functions as extern so we don't have to
  //  #include the binding header for simplicity.
+ extern bool wxLuaBinding_wxlua_init();
  extern bool wxLuaBinding_wx_init();
  extern bool wxLuaBinding_wxluacan_init();
***************
*** 292,295 ****
--- 293,297 ----
      // Initialize wxLua by first attaching the bindings we want to use
      //   note: make sure you link to the binding libraries
+     wxLuaBinding_wxlua_init();
      wxLuaBinding_wx_init();
      wxLuaBinding_wxluacan_init();

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxluacan.h	13 Jun 2007 00:08:57 -0000	1.29
--- wxluacan.h	14 Jun 2007 01:23:06 -0000	1.30
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 12
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 12
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 13
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 13
  // ---------------------------------------------------------------------------
  

Index: wxluacan_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_rules.lua,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxluacan_rules.lua	9 Jun 2006 03:24:48 -0000	1.12
--- wxluacan_rules.lua	14 Jun 2007 01:23:06 -0000	1.13
***************
*** 129,133 ****
  -------------------------------------------------------------------------------
  -- Add additional data types here
! -- example: dataTypes["wxArrayInt"] = AllocDataType("wxArrayInt", "class",false)
  
  --=============================================================================
--- 129,133 ----
  -------------------------------------------------------------------------------
  -- Add additional data types here
! -- example: AllocDataType("wxArrayInt", "class",false)
  
  --=============================================================================