[Wxlua-commit] wxLua/bindings/wxlua Makefile, 1.1, 1.2 override.hpp, 1.5, 1.6 wxlua.i, 1.6, 1.7 wxlua_rules.lua, 1.1, 1.2

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

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

Modified Files:
	Makefile override.hpp wxlua.i wxlua_rules.lua 
Log Message:
Separate wxWidgets bindings into wxadv, wxaui, wxbase, wxcore, etc...

Allow bool = 1/0 and 1/0 = bool in wxlua_getboolean/integer/number



Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	14 Jun 2007 01:23:07 -0000	1.1
--- Makefile	16 Jul 2007 19:34:15 -0000	1.2
***************
*** 1,11 ****
! #
! # File:		makefile.unx
  # Author:	John Labenski, J Winwood
  # Created:	2002
  # Updated:
  # Copyright: (c) 2002. J Winwood
- #
- #
- # Makefile for generating the bindings
  
  WXLUA_DIR = ../..
--- 1,7 ----
! # File:		Makefile
  # Author:	John Labenski, J Winwood
  # Created:	2002
  # Updated:
  # Copyright: (c) 2002. J Winwood
  
  WXLUA_DIR = ../..
***************
*** 14,18 ****
  
  genwxbind:
! 	@(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxlua/wxlua_rules.lua\"" genwxbind.lua > wxlua/error.txt)
  
  # do nothing to clean
--- 10,14 ----
  
  genwxbind:
! 	@(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxlua/wxlua_rules.lua\"" genwxbind.lua)
  
  # do nothing to clean

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** override.hpp	30 Jun 2007 00:12:20 -0000	1.5
--- override.hpp	16 Jul 2007 19:34:15 -0000	1.6
***************
*** 188,203 ****
          wxLuaBinding* binding = node->GetData();
  
-         lua_createtable(L, 3, 0); // sub table item for each binding
- 
-         lua_pushstring(L, "name");
-         lua_pushstring(L, wx2lua(binding->GetBindingName()));
-         lua_rawset(L, -3);
- 
-         lua_pushstring(L, "namespace");
-         lua_pushstring(L, wx2lua(binding->GetLuaNamespace()));
-         lua_rawset(L, -3);
- 
          // Push function to access the binding info
-         lua_pushstring(L, "binding");
          const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *));
          *ptr = binding;
--- 188,192 ----
***************
*** 213,217 ****
  
              lua_setmetatable(L, -2);
-         lua_rawset(L, -3);
  
          lua_rawseti(L, -2, idx);
--- 202,205 ----

Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlua.i	30 Jun 2007 00:12:20 -0000	1.6
--- wxlua.i	16 Jul 2007 19:34:15 -0000	1.7
***************
*** 5,12 ****
  // Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
  // Licence:     wxWidgets licence
! // wxWidgets:   Updated to 2.6.3
  // ===========================================================================
  
  // ---------------------------------------------------------------------------
  // Compile the luaScript of the given name and return the lua error code, a message
  // and the line number (or -1) of the error.
--- 5,24 ----
  // Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
  // Licence:     wxWidgets licence
! // wxWidgets:   Updated to 2.8.4
  // ===========================================================================
  
  // ---------------------------------------------------------------------------
+ // wxLua version defines
+ 
+ %define wxLUA_MAJOR_VERSION
+ %define wxLUA_MINOR_VERSION
+ %define wxLUA_RELEASE_NUMBER
+ %define wxLUA_SUBRELEASE_NUMBER
+ %define_string wxLUA_VERSION_STRING
+ 
+ %function bool wxLUA_CHECK_VERSION(int major, int minor, int release) // actually a define
+ %function bool wxLUA_CHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define
+ 
+ // ---------------------------------------------------------------------------
  // Compile the luaScript of the given name and return the lua error code, a message
  // and the line number (or -1) of the error.
***************
*** 115,120 ****
  
  // Entry point to get the objects below.
! // returns an array of tables for each installed binding
! //   { ["name"]=GetBindingName, ["namespace"]=GetLuaNamespace, ["binding"]=wxLuaBinding* }
  %function LuaTable GetBindings()
  
--- 127,131 ----
  
  // Entry point to get the objects below.
! // returns a table array of each installed binding { wxLuaBinding* }
  %function LuaTable GetBindings()
  

Index: wxlua_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua_rules.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlua_rules.lua	14 Jun 2007 01:23:07 -0000	1.1
--- wxlua_rules.lua	16 Jul 2007 19:34:15 -0000	1.2
***************
*** 14,18 ****
  
  -- Set the C++ "namespace" that the bindings will be placed.
! --   eg. cpp function names contain this to prevent duplicate function names
  hook_cpp_namespace = "wxlua"
  
--- 14,18 ----
  
  -- Set the C++ "namespace" that the bindings will be placed.
! --   i.e. cpp function names contain this to prevent duplicate function names
  hook_cpp_namespace = "wxlua"
  
***************
*** 106,110 ****
  --        that changes any data types used by this binding.
  
! datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wx_datatypes.lua" }
  
  -------------------------------------------------------------------------------
--- 106,110 ----
  --        that changes any data types used by this binding.
  
! datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxbase_datatypes.lua" }
  
  -------------------------------------------------------------------------------