[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.h, 1.13, 1.14 wxluacan_rules.lua, 1.11, 1.12

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

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

Modified Files:
	wxluacan.h wxluacan_rules.lua 
Log Message:
make using C++ namespaces ns::MyClass work for binding generator


Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxluacan.h	8 Jun 2006 03:22:06 -0000	1.13
--- wxluacan.h	9 Jun 2006 03:24:48 -0000	1.14
***************
*** 31,37 ****
  
  // bind wxLuaBinding_wxluacan to a single wxLuaState
! extern  bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState);
  // initialize wxLuaBinding_wxluacan for all wxLuaStates
! extern  bool wxLuaBinding_wxluacan_init();
  
  #include "cancom.h"
--- 31,37 ----
  
  // bind wxLuaBinding_wxluacan to a single wxLuaState
! extern WXLUA_NO_DLLIMPEXP bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState);
  // initialize wxLuaBinding_wxluacan for all wxLuaStates
! extern WXLUA_NO_DLLIMPEXP bool wxLuaBinding_wxluacan_init();
  
  #include "cancom.h"
***************
*** 42,69 ****
  
  // Lua Tag Method Values for each Class
! extern int s_wxluatag_wxlCan;
! extern int s_wxluatag_wxlCanObj;
! extern int s_wxluatag_wxlCanObjAddScript;
! extern int s_wxluatag_wxlCanObjCircle;
! extern int s_wxluatag_wxlCanObjRect;
! extern int s_wxluatag_wxlCanObjScript;
! extern int s_wxluatag_wxlLuaCanCmd;
  
  
  // Method Table
! extern  WXLUAMETHOD* wxlCan_methods;
! extern int wxlCan_methodCount;
! extern  WXLUAMETHOD* wxlCanObj_methods;
! extern int wxlCanObj_methodCount;
! extern  WXLUAMETHOD* wxlCanObjAddScript_methods;
! extern int wxlCanObjAddScript_methodCount;
! extern  WXLUAMETHOD* wxlCanObjCircle_methods;
! extern int wxlCanObjCircle_methodCount;
! extern  WXLUAMETHOD* wxlCanObjRect_methods;
! extern int wxlCanObjRect_methodCount;
! extern  WXLUAMETHOD* wxlCanObjScript_methods;
! extern int wxlCanObjScript_methodCount;
! extern  WXLUAMETHOD* wxlLuaCanCmd_methods;
! extern int wxlLuaCanCmd_methodCount;
  
  
--- 42,69 ----
  
  // Lua Tag Method Values for each Class
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd;
  
  
  // Method Table
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCan_methods;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObj_methods;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjAddScript_methods;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjCircle_methods;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjRect_methods;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlCanObjScript_methods;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD* wxlLuaCanCmd_methods;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
  
  

Index: wxluacan_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_rules.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxluacan_rules.lua	8 Jun 2006 03:22:06 -0000	1.11
--- wxluacan_rules.lua	9 Jun 2006 03:24:48 -0000	1.12
***************
*** 24,31 ****
  --=============================================================================
  -- Set the DLLIMPEXP macros for compiling these bindings into a DLL
! --  Set to "" for no IMPEXP macros
  
! output_cpp_impexpsymbol     = ""
! output_cpp_impexpdatasymbol = ""
  
  -------------------------------------------------------------------------------
--- 24,31 ----
  --=============================================================================
  -- Set the DLLIMPEXP macros for compiling these bindings into a DLL
! --  Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros
  
! output_cpp_impexpsymbol     = "WXLUA_NO_DLLIMPEXP"
! output_cpp_impexpdatasymbol = "WXLUA_NO_DLLIMPEXP_DATA"
  
  -------------------------------------------------------------------------------