From: John L. <jr...@us...> - 2008-01-29 00:49:43
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan_bind.cpp wxluacan_bind.h wxluacan_rules.lua Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxluacan_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluacan_bind.h 25 Jan 2008 23:50:46 -0000 1.1 --- wxluacan_bind.h 29 Jan 2008 00:49:10 -0000 1.2 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxluacan.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxluacan.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxluacan.cpp 25 Jan 2008 23:50:45 -0000 1.40 --- wxluacan.cpp 29 Jan 2008 00:49:10 -0000 1.41 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ./wxluacan.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxluacan_bind.cpp 25 Jan 2008 23:50:46 -0000 1.31 --- wxluacan_bind.cpp 29 Jan 2008 00:49:10 -0000 1.32 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ./wxluacan_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxluacan_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_rules.lua,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxluacan_rules.lua 25 Jan 2008 23:50:46 -0000 1.16 --- wxluacan_rules.lua 29 Jan 2008 00:49:10 -0000 1.17 *************** *** 1,22 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxLuaCan app's bindings for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "wxluacan" ! -- 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 = "wxluacan" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = "." output_cpp_filepath = "." ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,23 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxLuaCan app's bindings for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wxluacan" ! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but ! -- a string used in declared C++ objects to prevent duplicate names. ! -- See wxLuaBinding::GetBindingName(). hook_cpp_namespace = "wxluacan" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = "." output_cpp_filepath = "." ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 25,29 **** output_cpp_impexpdatasymbol = "WXLUA_NO_DLLIMPEXP_DATA" ! ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in --- 26,30 ---- output_cpp_impexpdatasymbol = "WXLUA_NO_DLLIMPEXP_DATA" ! -- ---------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in *************** *** 31,35 **** hook_cpp_header_filename = hook_cpp_namespace.."_bind.h" ! ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be --- 32,36 ---- hook_cpp_header_filename = hook_cpp_namespace.."_bind.h" ! -- ---------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be *************** *** 37,45 **** hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. --- 38,52 ---- hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! -- ---------------------------------------------------------------------------- ! -- Generate only a single output C++ binding source file with the name of ! -- hook_cpp_binding_filename, as opposed to generating a single cpp file ! -- for each *.i file plus the hook_cpp_binding_filename file. ! output_single_cpp_binding_file = false ! ! -- ---------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. *************** *** 51,79 **** hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file hook_cpp_binding_header_includes = "#include \"wxbind/include/wxcore_bind.h\"\n" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = "." ! ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. --- 58,86 ---- hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file hook_cpp_binding_header_includes = "#include \"wxbind/include/wxcore_bind.h\"\n" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! -- ============================================================================ -- Set the bindings directory that contains the *.i interface files interface_filepath = "." ! -- ---------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. *************** *** 84,88 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 91,95 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 90,94 **** override_fileTable = {} ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 97,101 ---- override_fileTable = {} ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 100,104 **** datatype_cache_input_fileTable = { "../../../bindings/wxwidgets/wx_datatypes.lua" } ! ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this --- 107,111 ---- datatype_cache_input_fileTable = { "../../../bindings/wxwidgets/wx_datatypes.lua" } ! -- ---------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this *************** *** 107,111 **** datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! --============================================================================= -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim --- 114,118 ---- datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! -- ============================================================================ -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim *************** *** 116,120 **** --wxLuaBinding_class_declaration = nothing to do here ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 123,127 ---- --wxLuaBinding_class_declaration = nothing to do here ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 124,136 **** --wxLuaBinding_class_implementation = nothing to do here ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 131,143 ---- --wxLuaBinding_class_implementation = nothing to do here ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true |