Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.11,1.12 wxlbind.h,1.4,1.5 wxlcallb.h,1.4,1.5 wxlstate.h,1.6,1.7
|
From: John L. <jr...@us...> - 2005-11-29 23:52:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1493/wxLua/modules/wxlua/include Modified Files: internal.h wxlbind.h wxlcallb.h wxlstate.h Log Message: reorder libs in apps.bkl and rebake, (remove -- in bkl, got error) pulled in generic code in wxLuaInterface into the wxLuaState Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlcallb.h 29 Nov 2005 05:45:09 -0000 1.4 --- wxlcallb.h 29 Nov 2005 23:52:12 -0000 1.5 *************** *** 56,60 **** wxEventType m_eventType; private: ! DECLARE_ABSTRACT_CLASS(wxLuaCallback); }; --- 56,60 ---- wxEventType m_eventType; private: ! DECLARE_ABSTRACT_CLASS(wxLuaCallback) }; Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlbind.h 29 Nov 2005 05:45:09 -0000 1.4 --- wxlbind.h 29 Nov 2005 23:52:12 -0000 1.5 *************** *** 149,153 **** // Get all the bindings that were created ! static wxLuaBindingList* GetBindingsList() { return &sm_bindings; } protected: --- 149,153 ---- // Get all the bindings that were created ! static wxLuaBindingList* GetBindingList() { return &sm_bindings; } protected: Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxlstate.h 29 Nov 2005 05:45:09 -0000 1.6 --- wxlstate.h 29 Nov 2005 23:52:12 -0000 1.7 *************** *** 49,54 **** class WXDLLIMPEXP_WXLUA wxLuaStateRefData; ! #include "wx/hashmap.h" ! WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaStateRefData *, wxHashMapLuaStateRefData ); //---------------------------------------------------------------------------- --- 49,89 ---- class WXDLLIMPEXP_WXLUA wxLuaStateRefData; ! // ---------------------------------------------------------------------------- ! // String functions - convert between Lua (ansi string) and wxString (encoded) ! // ---------------------------------------------------------------------------- ! ! // Convert a 8-bit Lua String into wxString ! inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char * luastr) ! { ! if (luastr == NULL) ! return wxEmptyString; ! ! return wxConvertMB2WX(luastr); // this fails on NULL ! } ! ! // Convert a wxString to 8-bit Lua String ! inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr) ! { ! wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str())); ! return buffer; ! } ! ! // Convert a wxString to 8-bit Lua Buffer and store it ! class WXDLLIMPEXP_WXLUA LuaCharBuffer ! { ! public: ! LuaCharBuffer(const wxString &wxstr) : m_buffer((const char *)NULL) ! { ! wxCharBuffer charBuffer = wxConvertWX2MB(wxstr.c_str()); ! m_buffer = charBuffer; ! } ! ! ~LuaCharBuffer() {} ! ! size_t Length() const { return strlen((const char*)m_buffer); } ! const char *GetData() const { return (const char*)m_buffer; } ! ! wxCharBuffer m_buffer; ! }; //---------------------------------------------------------------------------- *************** *** 57,60 **** --- 92,98 ---- //---------------------------------------------------------------------------- + #include "wx/hashmap.h" + WX_DECLARE_VOIDPTR_HASH_MAP( wxLuaStateRefData *, wxHashMapLuaStateRefData ); + class WXDLLIMPEXP_WXLUA wxLuaStateRefData : public wxObjectRefData { *************** *** 151,155 **** wxLuaStateRefData* GetLuaStateRefData() const { return (wxLuaStateRefData*)GetRefData(); } - // Get the wxEventType currently wxEventType GetInEventType() const; --- 189,192 ---- *************** *** 160,164 **** void RegisterBindings(bool registerTypes); ! wxLuaBinding* GetLuaBinding(const wxString& nameSpace); const WXLUACLASS * GetLuaClass(int iClassTag); --- 197,202 ---- void RegisterBindings(bool registerTypes); ! // Get the wxLuaBinding with the given nameSpace or NULL for no match ! wxLuaBinding* GetLuaBinding(const wxString& nameSpace) const; const WXLUACLASS * GetLuaClass(int iClassTag); *************** *** 185,189 **** void addToTrackedWindowList(wxWindow *win); void removeTrackedWindow(wxWindow *win); ! bool isWindowTracked(wxWindow *win) const; // ----------------------------------------------------------------------- --- 223,227 ---- void addToTrackedWindowList(wxWindow *win); void removeTrackedWindow(wxWindow *win); ! bool isWindowTracked(wxWindow *win, bool check_parents = true) const; // ----------------------------------------------------------------------- *************** *** 283,304 **** // FIXME LuaStackObject Stack(int index) { return LuaStackObject(this, index); } ! int GetTop(); void SetTop(int index); void PushValue(int index); // FIXME void PushValue(LuaStackObject object); void Remove(int index); void Insert(int index); void Replace(int index); ! int CheckStack(int size); void XMove(const wxLuaState& to, int n); ! int Equal(int index1, int index2); ! int RawEqual(int index1, int index2); ! int LessThan(int index1, int index2); // ----------------------------------------------------------------------- // Raw lua Arg functions. int TypeError(int narg, const char* tname); int ArgError(int narg, const char* extramsg); const char* CheckLString(int numArg, size_t* len); const char* OptLString(int numArg, const char *def, size_t* len); --- 321,359 ---- // FIXME LuaStackObject Stack(int index) { return LuaStackObject(this, index); } ! int GetTop(); void SetTop(int index); void PushValue(int index); // FIXME void PushValue(LuaStackObject object); + void PushNil(); void Remove(int index); + void Pop(int count); + int Next(int index); void Insert(int index); void Replace(int index); ! int CheckStack(int size); void XMove(const wxLuaState& to, int n); ! int Equal(int index1, int index2); ! int RawEqual(int index1, int index2); ! int LessThan(int index1, int index2); // ----------------------------------------------------------------------- // Raw lua Arg functions. + void GetGlobals(); + + int GetN(int index); + int Type(int index); + double ToNumber(int index); + int ToBoolean(int index); + wxString TowxString(int index); + const void *ToPointer(int index); + bool IsCFunction(int index); + const void *ToCFunction(int index); + const void *ToUserData(int index); + int TypeError(int narg, const char* tname); + int TypeError(int narg, const wxString& tname) { return TypeError(narg, (const char*)wx2lua(tname)); } int ArgError(int narg, const char* extramsg); + int ArgError(int narg, const wxString& extramsg) { return ArgError(narg, (const char*)wx2lua(extramsg)); } const char* CheckLString(int numArg, size_t* len); const char* OptLString(int numArg, const char *def, size_t* len); *************** *** 322,327 **** --- 377,385 ---- int GetStack(int level, lua_Debug* ar); int GetInfo(const char* what, lua_Debug* ar); + int GetInfo(const wxString& str, lua_Debug* ar) { return GetInfo((const char*)wx2lua(str), ar); } const char* GetLocal(const lua_Debug* ar, int n); + wxString GetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(GetLocal(ar, n)); } const char* SetLocal(const lua_Debug* ar, int n); + wxString SetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(SetLocal(ar, n)); } int SetHook(lua_Hook func, int mask, int count); Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** internal.h 29 Nov 2005 05:45:09 -0000 1.11 --- internal.h 29 Nov 2005 23:52:12 -0000 1.12 *************** *** 361,401 **** int LUACALL CreateStandaloneBitmaps(lua_State *luaState); - // ---------------------------------------------------------------------------- - // String functions - convert between Lua (ansi string) and wxString (encoded) - // ---------------------------------------------------------------------------- - - // Convert a 8-bit Lua String into wxString - inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char * luastr) - { - if (luastr == NULL) - return wxEmptyString; - - return wxConvertMB2WX(luastr); // this fails on NULL - } - - // Convert a wxString to 8-bit Lua String - inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr) - { - wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str())); - return buffer; - } - - // Convert a wxString to 8-bit Lua Buffer and store it - class WXDLLIMPEXP_WXLUA LuaCharBuffer - { - public: - LuaCharBuffer(const wxString &wxstr) : m_buffer((const char *)NULL) - { - wxCharBuffer charBuffer = wxConvertWX2MB(wxstr.c_str()); - m_buffer = charBuffer; - } - - ~LuaCharBuffer() {} - - size_t Length() const { return strlen((const char*)m_buffer); } - const char *GetData() const { return (const char*)m_buffer; } - - wxCharBuffer m_buffer; - }; - #endif // WX_LUA_INTERNALS_H --- 361,363 ---- |
