From: John L. <jr...@us...> - 2007-07-16 19:36:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15684/wxLua/modules/wxlua/include Modified Files: wxldefs.h wxlua_bind.h 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: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxldefs.h 2 Jul 2007 01:00:16 -0000 1.28 --- wxldefs.h 16 Jul 2007 19:35:30 -0000 1.29 *************** *** 67,71 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 14 // ---------------------------------------------------------------------------- --- 67,71 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 15 // ---------------------------------------------------------------------------- *************** *** 119,122 **** --- 119,146 ---- // ---------------------------------------------------------------------------- + // Convert from wxWidgets wxT('') to wxT(""), a string. Copied from wx/filefn.h + + // platform independent versions + #if defined(__UNIX__) && !defined(__OS2__) + // CYGWIN also uses UNIX settings + #define wxLua_FILE_SEP_PATH wxT("/") + #elif defined(__MAC__) + #define wxLua_FILE_SEP_PATH wxT(":") + #else // Windows and OS/2 + #define wxLua_FILE_SEP_PATH wxT("\\") + #endif // Unix/Windows + + // ---------------------------------------------------------------------------- + // wxWidgets compatibility defines + // ---------------------------------------------------------------------------- + + #ifndef wxUSE_WAVE + #define wxUSE_WAVE 0 + #endif + #ifndef wxUSE_SOUND + #define wxUSE_SOUND 0 + #endif + + // ---------------------------------------------------------------------------- // Forward declared classes // ---------------------------------------------------------------------------- *************** *** 124,126 **** --- 148,151 ---- class WXDLLIMPEXP_WXLUA wxLuaState; + #endif // __WX_WXLDEFS_H__ Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlua_bind.h 16 Jun 2007 06:21:46 -0000 1.2 --- wxlua_bind.h 16 Jul 2007 19:35:30 -0000 1.3 *************** *** 17,23 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 14 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 14 // --------------------------------------------------------------------------- --- 17,23 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 15 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 15 // --------------------------------------------------------------------------- |