Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.91, 1.92 wxadv_rules.lua, 1.3, 1.4 wxaui_rules.lua, 1.3, 1.4 wxbase_file.i, 1.3, 1.4 wxbase_override.hpp, 1.16, 1.17 wxbase_rules.lua, 1.8, 1.9 wxcore_controls.i, 1.4, 1.5 wxcore_core.i, 1.2, 1.3 wxcore_rules.lua, 1.5, 1.6 wxdatatypes_rules.lua, 1.2, 1.3 wxgl_rules.lua, 1.3, 1.4 wxhtml_rules.lua, 1.3, 1.4 wxmedia_rules.lua, 1.3, 1.4 wxnet_rules.lua, 1.3, 1.4 wxrichtext_rules.lua, 1.3, 1.4 wxstc_rules.lua, 1.3, 1.4 wxxml_rules.lua, 1.3, 1.4 wxxrc_rules.lua, 1.3, 1.4
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxadv_rules.lua wxaui_rules.lua wxbase_file.i wxbase_override.hpp wxbase_rules.lua wxcore_controls.i wxcore_core.i wxcore_rules.lua wxdatatypes_rules.lua wxgl_rules.lua wxhtml_rules.lua wxmedia_rules.lua wxnet_rules.lua wxrichtext_rules.lua wxstc_rules.lua wxxml_rules.lua wxxrc_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: wxcore_core.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_core.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_core.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxcore_core.i 29 Jan 2008 00:49:11 -0000 1.3 *************** *** 278,279 **** --- 278,311 ---- %endif //wxLUA_USE_wxGenericValidator %endif //wxLUA_USE_wxValidator && wxUSE_VALIDATORS + + + // --------------------------------------------------------------------------- + // wxMemoryFSHandler - See also wxbase_file.i for other wxFileSystemHandlers + + %if wxUSE_STREAMS && wxUSE_FILESYSTEM + + %include "wx/fs_mem.h" + + %class %noclassinfo %delete wxMemoryFSHandler, wxFileSystemHandler + wxMemoryFSHandler() + + // Remove file from memory FS and free occupied memory + static void RemoveFile(const wxString& filename); + + static void AddFile(const wxString& filename, const wxString& textdata); + //static void AddFile(const wxString& filename, const void *binarydata, size_t size) + + %if %wxchkver_2_8_5 + static void AddFileWithMimeType(const wxString& filename, const wxString& textdata, const wxString& mimetype); + //static void AddFileWithMimeType(const wxString& filename, const void *binarydata, size_t size, const wxString& mimetype) + %endif // %wxchkver_2_8_5 + + %if wxUSE_IMAGE + static void AddFile(const wxString& filename, const wxImage& image, long type); + static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); + %endif // wxUSE_IMAGE + + %endclass + + + %endif // wxUSE_STREAMS && wxUSE_FILESYSTEM Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxbase_override.hpp 23 Jan 2008 06:43:34 -0000 1.16 --- wxbase_override.hpp 29 Jan 2008 00:49:11 -0000 1.17 *************** *** 511,515 **** wxDos2UnixFilename((wxChar*)str.GetData()); // push the result string ! lua_pushstring(L, wx2lua(str)); return 1; --- 511,515 ---- wxDos2UnixFilename((wxChar*)str.GetData()); // push the result string ! wxlua_pushwxString(L, str); return 1; *************** *** 529,533 **** wxUnix2DosFilename((wxChar*)str.GetData()); // push the result string ! lua_pushstring(L, wx2lua(str)); return 1; --- 529,533 ---- wxUnix2DosFilename((wxChar*)str.GetData()); // push the result string ! wxlua_pushwxString(L, str); return 1; *************** *** 546,550 **** wxString returns = wxGetTempFileName(prefix, NULL); // push the result number ! lua_pushstring(L, wx2lua(returns)); // return the number of parameters return 1; --- 546,550 ---- wxString returns = wxGetTempFileName(prefix, NULL); // push the result number ! wxlua_pushwxString(L, returns); // return the number of parameters return 1; *************** *** 806,810 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(desc)); return 2; --- 806,810 ---- // push the result flag lua_pushboolean(L, returns); ! wxlua_pushwxString(L, desc); return 2; *************** *** 826,830 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(printCmd)); return 2; --- 826,830 ---- // push the result flag lua_pushboolean(L, returns); ! wxlua_pushwxString(L, printCmd); return 2; *************** *** 851,855 **** lua_pushlstring(L, (const char *)buffer, size); free(buffer); ! return 2; } return 0; --- 851,855 ---- lua_pushlstring(L, (const char *)buffer, size); free(buffer); ! return 1; } return 0; *************** *** 914,915 **** --- 914,938 ---- } %end + + + %override wxLua_wxFileSystem_FindFileInPath + // bool FindFileInPath(wxString *pStr, const wxChar *path, const wxChar *file); + // bool FindFileInPath(const wxString& path, const wxString& file); + static int LUACALL wxLua_wxFileSystem_FindFileInPath(lua_State *L) + { + // const wxString file + const wxString file_ = wxlua_getwxStringtype(L, 3); + // const wxString path + const wxString path = wxlua_getwxStringtype(L, 2); + // get this + wxFileSystem * self = (wxFileSystem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystem); + // call FindFileInPath + wxString str; + bool returns = (self->FindFileInPath(&str, path, file_)); + // push the result flag + lua_pushboolean(L, returns); + wxlua_pushwxString(L, str); + + return 2; + } + %end Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** wx_datatypes.lua 17 Jan 2008 18:26:27 -0000 1.91 --- wx_datatypes.lua 29 Jan 2008 00:49:10 -0000 1.92 *************** *** 1,6 **** -- --------------------------------------------------------------------------- ! -- This file was generated by genwxbind.lua -- ! -- Any changes made to this file may be lost when file is regenerated -- --------------------------------------------------------------------------- --- 1,6 ---- -- --------------------------------------------------------------------------- ! -- ../bindings/wxwidgets/wx_datatypes.lua was generated by genwxbind.lua -- ! -- Any changes made to this file will be lost when the file is regenerated -- --------------------------------------------------------------------------- *************** *** 269,272 **** --- 269,279 ---- ValueType = "enum", }, + wxArchiveFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxArchiveFSHandler", + ValueType = "class", + }, wxArrayInt = { ["%encapsulate"] = true, *************** *** 1348,1351 **** --- 1355,1365 ---- ValueType = "class", }, + wxFSFile = { + BaseClass = "wxObject", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFSFile", + ValueType = "class", + }, wxFTP = { BaseClass = "wxProtocol", *************** *** 1465,1468 **** --- 1479,1496 ---- ValueType = "class", }, + wxFileSystem = { + BaseClass = "wxObject", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFileSystem", + ValueType = "class", + }, + wxFileSystemHandler = { + BaseClass = "wxObject", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFileSystemHandler", + ValueType = "class", + }, wxFileType = { ["%encapsulate"] = true, *************** *** 1483,1486 **** --- 1511,1521 ---- ValueType = "class", }, + wxFilterFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFilterFSHandler", + ValueType = "class", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 2258,2261 **** --- 2293,2297 ---- }, wxInputStream = { + ["%encapsulate"] = true, BaseClass = "wxStreamBase", Condition = "wxUSE_STREAMS", *************** *** 2284,2287 **** --- 2320,2330 ---- ValueType = "number", }, + wxInternetFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)", + IsNumber = false, + Name = "wxInternetFSHandler", + ValueType = "class", + }, wxItemKind = { Condition = "wxLUA_USE_wxMenu && wxUSE_MENUS", *************** *** 2454,2457 **** --- 2497,2507 ---- ValueType = "class", }, + wxLocalFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxLocalFSHandler", + ValueType = "class", + }, wxLocale = { ["%encapsulate"] = true, *************** *** 2664,2667 **** --- 2714,2724 ---- ValueType = "class", }, + wxMemoryFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "wxUSE_STREAMS && wxUSE_FILESYSTEM", + IsNumber = false, + Name = "wxMemoryFSHandler", + ValueType = "class", + }, wxMemoryInputStream = { ["%encapsulate"] = true, *************** *** 2872,2875 **** --- 2929,2933 ---- }, wxOutputStream = { + ["%encapsulate"] = true, BaseClass = "wxStreamBase", Condition = "wxUSE_STREAMS", Index: wxrichtext_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxrichtext_rules.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxrichtext_rules.lua 25 Jan 2008 23:50:49 -0000 1.3 --- wxrichtext_rules.lua 29 Jan 2008 00:49:11 -0000 1.4 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build wxWidgets' wxRichText binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- 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. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxrichtext" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! --============================================================================= -- 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,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build wxWidgets' wxRichText binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- 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 = "wxrichtext" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXRICHTEXT" ! ------------------------------------------------------------------------------- -- 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 --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXRICHTEXT" ! -- ---------------------------------------------------------------------------- -- 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 *************** *** 35,39 **** hook_cpp_header_filename = "wxbind/include/"..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 --- 36,40 ---- hook_cpp_header_filename = "wxbind/include/"..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 *************** *** 41,49 **** 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. --- 42,56 ---- 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. *************** *** 55,69 **** 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 --- 62,76 ---- 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 *************** *** 71,87 **** "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n".. ! "#include \""..hook_cpp_header_filename.."\"\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 = wxlua_dir.."bindings/wxwidgets" ! ------------------------------------------------------------------------------- -- 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. --- 78,93 ---- "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#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 = wxlua_dir.."bindings/wxwidgets" ! -- ---------------------------------------------------------------------------- -- 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. *************** *** 92,96 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 98,102 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 98,102 **** --override_fileTable = { "override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 104,108 ---- --override_fileTable = { "override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 108,112 **** datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_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 --- 114,118 ---- datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_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 *************** *** 115,119 **** 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 --- 121,125 ---- 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 *************** *** 124,128 **** --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 --- 130,134 ---- --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 *************** *** 132,144 **** --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 --- 138,150 ---- --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 Index: wxadv_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_rules.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxadv_rules.lua 25 Jan 2008 23:50:47 -0000 1.3 --- wxadv_rules.lua 29 Jan 2008 00:49:10 -0000 1.4 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build wxWidgets' wxAdv binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- 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. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxadv" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! --============================================================================= -- 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,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build wxWidgets' wxAdv binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- 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 = "wxadv" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXADV" ! ------------------------------------------------------------------------------- -- 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 --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXADV" ! -- ---------------------------------------------------------------------------- -- 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 *************** *** 35,39 **** hook_cpp_header_filename = "wxbind/include/"..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 --- 36,40 ---- hook_cpp_header_filename = "wxbind/include/"..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 *************** *** 41,49 **** 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. --- 42,56 ---- 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. *************** *** 55,69 **** 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 --- 62,76 ---- 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 *************** *** 71,87 **** "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n".. ! "#include \""..hook_cpp_header_filename.."\"\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 = wxlua_dir.."bindings/wxwidgets" ! ------------------------------------------------------------------------------- -- 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. --- 78,93 ---- "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#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 = wxlua_dir.."bindings/wxwidgets" ! -- ---------------------------------------------------------------------------- -- 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. *************** *** 93,97 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 99,103 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 99,103 **** override_fileTable = { "wxadv_override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 105,109 ---- override_fileTable = { "wxadv_override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 109,113 **** datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_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 --- 115,119 ---- datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_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 *************** *** 116,120 **** 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 --- 122,126 ---- 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 *************** *** 125,129 **** --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 --- 131,135 ---- --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 *************** *** 133,145 **** --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 --- 139,151 ---- --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 Index: wxbase_file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxbase_file.i 18 Dec 2007 01:03:32 -0000 1.3 --- wxbase_file.i 29 Jan 2008 00:49:11 -0000 1.4 *************** *** 699,703 **** // wxInputStream ! %class %noclassinfo wxInputStream, wxStreamBase // wxInputStream() this is only a base class --- 699,703 ---- // wxInputStream ! %class %noclassinfo %encapsulate wxInputStream, wxStreamBase // wxInputStream() this is only a base class *************** *** 726,730 **** // wxOutputStream ! %class %noclassinfo wxOutputStream, wxStreamBase // wxOutputStream() this is only a base class --- 726,730 ---- // wxOutputStream ! %class %noclassinfo %encapsulate wxOutputStream, wxStreamBase // wxOutputStream() this is only a base class *************** *** 876,878 **** --- 876,1054 ---- + + // --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // wxFSFile + + %if wxUSE_FILESYSTEM // already has wxUSE_STREAMS + + %include "wx/filesys.h" + + + %class %delete wxFSFile, wxObject + wxFSFile(%ungc wxInputStream *stream, const wxString& loc, const wxString& mimetype, const wxString& anchor, wxDateTime modif) + + // returns stream. This doesn't give away ownership of the stream object. + wxInputStream *GetStream() const + // gives away the ownership of the current stream. + %gc wxInputStream *DetachStream() + // deletes the current stream and takes ownership of another. + void SetStream(%ungc wxInputStream *stream) + + // returns file's mime type + wxString GetMimeType() const + // returns the original location (aka filename) of the file + wxString GetLocation() const + wxString GetAnchor() const + wxDateTime GetModificationTime() const + + %endclass + + + // --------------------------------------------------------------------------- + // wxFileSystemHandler + + %class %delete wxFileSystemHandler, wxObject + // wxFileSystemHandler() // no constructor since it has abstract functions + + // returns true if this handler is able to open given location + virtual bool CanOpen(const wxString& location) //= 0; + + // opens given file and returns pointer to input stream. + // Returns NULL if opening failed. + // The location is always absolute path. + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) //= 0; + + // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting + // the query to directories or wxFILE for files only or 0 for either. + // Returns filename or empty string if no more matching file exists + virtual wxString FindFirst(const wxString& spec, int flags = 0); + virtual wxString FindNext(); + %endclass + + + // --------------------------------------------------------------------------- + // wxLocalFSHandler + + + %class %delete wxLocalFSHandler, wxFileSystemHandler + wxLocalFSHandler() + + // wxLocalFSHandler will prefix all filenames with 'root' before accessing + // files on disk. This effectively makes 'root' the top-level directory + // and prevents access to files outside this directory. + // (This is similar to Unix command 'chroot'.) + static void Chroot(const wxString& root) + + %endclass + + + // --------------------------------------------------------------------------- + // wxFileSystem + + %enum + wxFS_READ // Open for reading + wxFS_SEEKABLE // Returned stream will be seekable + %endenum + + %class %noclassinfo %delete wxFileSystem, wxObject + wxFileSystem() + + // sets the current location. Every call to OpenFile is + // relative to this location. + // NOTE !! + // unless is_dir = true 'location' is *not* the directory but + // file contained in this directory + // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/") + void ChangePathTo(const wxString& location, bool is_dir = false); + + wxString GetPath() const + + // opens given file and returns pointer to input stream. + // Returns NULL if opening failed. + // It first tries to open the file in relative scope + // (based on ChangePathTo()'s value) and then as an absolute + // path. + wxFSFile* OpenFile(const wxString& location, int flags = wxFS_READ); + + // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting + // the query to directories or wxFILE for files only or 0 for either. + // Returns filename or empty string if no more matching file exists + wxString FindFirst(const wxString& spec, int flags = 0); + wxString FindNext(); + + // find a file in a list of directories, returns false if not found + // %override [bool, Lua string full_path] bool FindFileInPath(const wxString& path, const wxString& file); + // C++ Func: bool FindFileInPath(wxString *pStr, const wxChar *path, const wxChar *file); + bool FindFileInPath(const wxString& path, const wxString& file); + + // Adds FS handler. + // In fact, this class is only front-end to the FS handlers :-) + static void AddHandler(wxFileSystemHandler *handler); + + // Removes FS handler + static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler); + + // Returns true if there is a handler which can open the given location. + static bool HasHandlerForPath(const wxString& location); + + // remove all items from the m_Handlers list + static void CleanUpHandlers(); + + // Returns the native path for a file URL + static wxFileName URLToFileName(const wxString& url); + + // Returns the file URL for a native path + static wxString FileNameToURL(const wxFileName& filename); + %endclass + + + // --------------------------------------------------------------------------- + // wxArchiveFSHandler + + %include "wx/fs_arc.h" + + %class %delete wxArchiveFSHandler, wxFileSystemHandler + wxArchiveFSHandler() + + %endclass + + // --------------------------------------------------------------------------- + // wxZipFSHandler - is just a typedef to wxArchiveFSHandler + + //%include "wx/fs_zip.h" + + //%if wxUSE_FS_ZIP + // typedef wxArchiveFSHandler wxZipFSHandler; + //%endif + + // --------------------------------------------------------------------------- + // wxFilterFSHandler + + %include "wx/fs_filter.h" + + %class %delete wxFilterFSHandler, wxFileSystemHandler + wxFilterFSHandler() + + %endclass + + // --------------------------------------------------------------------------- + // wxInternetFSHandler + + %if wxUSE_FS_INET && wxUSE_SOCKETS // already has wxUSE_STREAMS && wxUSE_FILESYSTEM + %include "wx/fs_inet.h" + + %class %delete wxInternetFSHandler, wxFileSystemHandler + wxInternetFSHandler() + + %endclass + %endif //wxUSE_FS_INET && wxUSE_SOCKETS + + // --------------------------------------------------------------------------- + // wxMemoryFSHandler - See wxcore_core.i for this since it requires wxImage & wxBitmap. + + + %endif // wxUSE_FILESYSTEM + + %endif // wxUSE_STREAMS Index: wxbase_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbase_rules.lua 25 Jan 2008 23:50:48 -0000 1.8 --- wxbase_rules.lua 29 Jan 2008 00:49:11 -0000 1.9 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxWidgets binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- 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. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxbase" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! --============================================================================= -- 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,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxWidgets binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- 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 = "wxbase" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXBASE" ! ------------------------------------------------------------------------------- -- 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 --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXBASE" ! -- ---------------------------------------------------------------------------- -- 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 *************** *** 35,39 **** hook_cpp_header_filename = "wxbind/include/"..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 --- 36,40 ---- hook_cpp_header_filename = "wxbind/include/"..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 *************** *** 41,49 **** 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. --- 42,56 ---- 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. *************** *** 55,64 **** 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 --- 62,71 ---- 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 *************** *** 68,72 **** "#ifdef Below\n #undef Below\n#endif\n" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file, -- hook_cpp_header_filename. --- 75,79 ---- "#ifdef Below\n #undef Below\n#endif\n" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file, -- hook_cpp_header_filename. *************** *** 74,90 **** hook_cpp_binding_header_includes = "#include \"wxbind/include/wxbinddefs.h\"\n".. ! "#include \"wxluasetup.h\"\n".. ! "#include \""..hook_cpp_header_filename.."\"\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 = wxlua_dir.."bindings/wxwidgets" ! ------------------------------------------------------------------------------- -- 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. --- 81,96 ---- hook_cpp_binding_header_includes = "#include \"wxbind/include/wxbinddefs.h\"\n".. ! "#include \"wxluasetup.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 = wxlua_dir.."bindings/wxwidgets" ! -- ---------------------------------------------------------------------------- -- 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. *************** *** 99,103 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 105,109 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 105,109 **** override_fileTable = { "wxbase_override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 111,115 ---- override_fileTable = { "wxbase_override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 115,119 **** --datatype_cache_input_fileTable = { "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 --- 121,125 ---- --datatype_cache_input_fileTable = { "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 *************** *** 122,126 **** 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 --- 128,132 ---- 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 *************** *** 134,138 **** ]] ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 140,144 ---- ]] ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 162,174 **** ]] ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here AllocDataType("wxLuaObject", "class", false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 168,180 ---- ]] ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here AllocDataType("wxLuaObject", "class", false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true Index: wxdatatypes_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxdatatypes_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxdatatypes_rules.lua 25 Jan 2008 23:50:48 -0000 1.2 --- wxdatatypes_rules.lua 29 Jan 2008 00:49:11 -0000 1.3 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxWidgets datatypes for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "" ! -- 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 = "wx" ! --============================================================================= -- 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,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxWidgets datatypes for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "" ... [truncated message content] |
