Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets wxadv_override.hpp, 1.3, 1.4 wxbase_base.i, 1.2, 1.3 wxbase_override.hpp, 1.13, 1.14 wxbase_rules.lua, 1.5, 1.6 wxcore_controls.i, 1.2, 1.3 wxcore_gdi.i, 1.2, 1.3 wxcore_override.hpp, 1.14, 1.15 wxhtml_override.hpp, 1.6, 1.7 wxnet_override.hpp, 1.2, 1.3 wxstc_override.hpp, 1.4, 1.5 wxxml_override.hpp, 1.7, 1.8
|
From: John L. <jr...@us...> - 2007-12-22 06:07:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/bindings/wxwidgets Modified Files: wxadv_override.hpp wxbase_base.i wxbase_override.hpp wxbase_rules.lua wxcore_controls.i wxcore_gdi.i wxcore_override.hpp wxhtml_override.hpp wxnet_override.hpp wxstc_override.hpp wxxml_override.hpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxcore_gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_gdi.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxcore_gdi.i 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 630,634 **** int GetCap() const ! wxColour& GetColour() const // int GetDashes(wxDash** dashes) const int GetJoin() const --- 630,634 ---- int GetCap() const ! wxColour GetColour() const // not wxColur& so we allocate a new one // int GetDashes(wxDash** dashes) const int GetJoin() const Index: wxnet_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxnet_override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxnet_override.hpp 7 Dec 2007 02:13:10 -0000 1.2 --- wxnet_override.hpp 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 21,25 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Peek self->Peek(buffer, nbytes); --- 21,25 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->Peek(buffer, nbytes); *************** *** 44,48 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Peek self->Read(buffer, nbytes); --- 44,48 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->Read(buffer, nbytes); *************** *** 67,71 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Peek self->ReadMsg(buffer, nbytes); --- 67,71 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->ReadMsg(buffer, nbytes); *************** *** 90,94 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Unread self->Unread(buffer, nbytes); --- 90,94 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Unread self->Unread(buffer, nbytes); *************** *** 109,113 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Write self->Write(buffer, nbytes); --- 109,113 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Write self->Write(buffer, nbytes); *************** *** 128,132 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call WriteMsg self->WriteMsg(buffer, nbytes); --- 128,132 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call WriteMsg self->WriteMsg(buffer, nbytes); Index: wxbase_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxbase_rules.lua 5 Dec 2007 00:34:45 -0000 1.5 --- wxbase_rules.lua 22 Dec 2007 06:07:08 -0000 1.6 *************** *** 137,145 **** lua_State* L = wxlState.GetLuaState(); ! g_wxluatag_NULL = wxluaT_newtag(L); lua_pop(L, 1); // pop the table lua_pushlstring(L, "NULL", 4); ! wxluaT_pushusertag(L, NULL, g_wxluatag_NULL, true); lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag ]] --- 137,145 ---- lua_State* L = wxlState.GetLuaState(); ! g_wxluatag_NULL = wxluaT_newmetatable(L); lua_pop(L, 1); // pop the table lua_pushlstring(L, "NULL", 4); ! wxluaT_pushuserdatatype(L, NULL, g_wxluatag_NULL, true, true); lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag ]] Index: wxstc_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_override.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxstc_override.hpp 18 Dec 2007 01:03:32 -0000 1.4 --- wxstc_override.hpp 22 Dec 2007 06:07:08 -0000 1.5 *************** *** 16,20 **** int linePos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call GetCurLine wxString returns = self->GetCurLine(&linePos); --- 16,20 ---- int linePos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call GetCurLine wxString returns = self->GetCurLine(&linePos); *************** *** 34,38 **** int startPos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call GetSelection self->GetSelection(&startPos, &endPos); --- 34,38 ---- int startPos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call GetSelection self->GetSelection(&startPos, &endPos); *************** *** 54,58 **** int length = (int)lua_tonumber(L, 2); // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call SetStyleBytes self->SetStyleBytes(length, styleBytes); --- 54,58 ---- int length = (int)lua_tonumber(L, 2); // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call SetStyleBytes self->SetStyleBytes(length, styleBytes); Index: wxhtml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_override.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxhtml_override.hpp 20 Dec 2007 02:26:55 -0000 1.6 --- wxhtml_override.hpp 22 Dec 2007 06:07:08 -0000 1.7 *************** *** 19,23 **** int pagebreak = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak); --- 19,23 ---- int pagebreak = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak); *************** *** 36,42 **** int pagebreak = (int)wxlua_getintegertype(L, 3); // wxArrayInt& known_pagebreaks ! wxArrayInt* known_pagebreaks = (wxArrayInt *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxArrayInt); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); --- 36,42 ---- int pagebreak = (int)wxlua_getintegertype(L, 3); // wxArrayInt& known_pagebreaks ! wxArrayInt* known_pagebreaks = (wxArrayInt *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxArrayInt); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); *************** *** 59,63 **** int condition = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call Find switch(lua_type(L, 3)) --- 59,63 ---- int condition = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call Find switch(lua_type(L, 3)) *************** *** 82,91 **** default: ! wxlua_error(L, "wxLua: Expected simple type for parameter 3."); break; } // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxHtmlCell, returns); // return the number of parameters return 1; --- 82,91 ---- default: ! wxlua_argerror(L, 3, wxT("a 'nil', 'string', or a 'number'")); break; } // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxHtmlCell); // return the number of parameters return 1; *************** *** 101,105 **** wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsColour bool returns = self->GetParamAsColour(par, retColour); --- 101,105 ---- wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlTag); // call GetParamAsColour bool returns = self->GetParamAsColour(par, retColour); *************** *** 107,111 **** // push the result number lua_pushboolean(L, returns); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxColour, retColour); // return the number of parameters return 2; --- 107,111 ---- // push the result number lua_pushboolean(L, returns); ! wxluaT_pushuserdatatype(L, retColour, g_wxluatype_wxColour); // return the number of parameters return 2; *************** *** 121,125 **** wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsInt bool returns = self->GetParamAsInt(par, &value); --- 121,125 ---- wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlTag); // call GetParamAsInt bool returns = self->GetParamAsInt(par, &value); *************** *** 180,184 **** wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWinParser *self = (wxHtmlWinParser *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlWinParser); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); --- 180,184 ---- wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWinParser *self = (wxHtmlWinParser *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlWinParser); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); *************** *** 235,239 **** wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWindow *self = (wxHtmlWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlWindow); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); --- 235,239 ---- wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWindow *self = (wxHtmlWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlWindow); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); *************** *** 256,266 **** long style = (argCount >= 5 ? (long)wxlua_getintegertype(L, 5) : wxHW_SCROLLBAR_AUTO); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getintegertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor wxLuaHtmlWindow *returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); --- 256,266 ---- long style = (argCount >= 5 ? (long)wxlua_getintegertype(L, 5) : wxHW_SCROLLBAR_AUTO); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getintegertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxWindow); // call constructor wxLuaHtmlWindow *returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); *************** *** 269,273 **** wxluaW_addtrackedwindow(L, (wxWindow*)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaHtmlWindow, returns); return 1; --- 269,273 ---- wxluaW_addtrackedwindow(L, (wxWindow*)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaHtmlWindow); return 1; Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_override.hpp 20 Dec 2007 02:26:55 -0000 1.14 --- wxcore_override.hpp 22 Dec 2007 06:07:08 -0000 1.15 *************** *** 17,21 **** wxApp *returns = wxTheApp; // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxApp, returns); // return the number of parameters return 1; --- 17,21 ---- wxApp *returns = wxTheApp; // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxApp); // return the number of parameters [...2099 lines suppressed...] const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); --- 2743,2747 ---- int argCount = lua_gettop(L); // wxLuaObject pObject = NULL ! wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxLuaObject) : NULL); // const wxString title = "Printout" const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); *************** *** 2754,2758 **** wxluaO_addgcobject(L, (wxLuaPrintout *)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaPrintout, returns); return 1; --- 2751,2755 ---- wxluaO_addgcobject(L, (wxLuaPrintout *)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaPrintout); return 1; Index: wxadv_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxadv_override.hpp 10 Dec 2007 05:39:05 -0000 1.3 --- wxadv_override.hpp 22 Dec 2007 06:07:08 -0000 1.4 *************** *** 15,21 **** { // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPoint); // get this ! wxCalendarCtrl * self = (wxCalendarCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxCalendarCtrl); // call HitTest wxDateTime* date = new wxDateTime(); --- 15,21 ---- { // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPoint); // get this ! wxCalendarCtrl * self = (wxCalendarCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxCalendarCtrl); // call HitTest wxDateTime* date = new wxDateTime(); *************** *** 25,29 **** // push the result number lua_pushnumber(L, returns); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, date); lua_pushnumber(L, wd); --- 25,29 ---- // push the result number lua_pushnumber(L, returns); ! wxluaT_pushuserdatatype(L, date, g_wxluatype_wxDateTime); lua_pushnumber(L, wd); *************** *** 44,48 **** // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGridCellAttr); // call GetAlignment self->GetAlignment(&horz, &vert); --- 44,48 ---- // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGridCellAttr); // call GetAlignment self->GetAlignment(&horz, &vert); *************** *** 63,67 **** // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGridCellAttr); // call GetAlignment self->GetSize(&num_rows, &num_cols); --- 63,67 ---- // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGridCellAttr); // call GetAlignment self->GetSize(&num_rows, &num_cols); *************** *** 81,85 **** int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetRowLabelAlignment self->GetRowLabelAlignment(&horz, &vert); --- 81,85 ---- int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetRowLabelAlignment self->GetRowLabelAlignment(&horz, &vert); *************** *** 99,103 **** int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetColLabelAlignment self->GetColLabelAlignment(&horz, &vert); --- 99,103 ---- int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetColLabelAlignment self->GetColLabelAlignment(&horz, &vert); *************** *** 117,121 **** int horiz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetDefaultCellAlignment self->GetDefaultCellAlignment(&horiz, &vert); --- 117,121 ---- int horiz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetDefaultCellAlignment self->GetDefaultCellAlignment(&horiz, &vert); *************** *** 139,143 **** int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &horiz, &vert); --- 139,143 ---- int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &horiz, &vert); *************** *** 161,165 **** int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &num_rows, &num_cols); --- 161,165 ---- int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &num_rows, &num_cols); *************** *** 179,187 **** long width; // wxArrayString& lines ! wxArrayString *lines = (wxArrayString *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxArrayString); // wxDC& dc ! wxDC *dc = (wxDC *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxDC); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetTextBoxSize self->GetTextBoxSize(*dc, *lines, &width, &height); --- 179,187 ---- long width; // wxArrayString& lines ! wxArrayString *lines = (wxArrayString *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxArrayString); // wxDC& dc ! wxDC *dc = (wxDC *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxDC); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetTextBoxSize self->GetTextBoxSize(*dc, *lines, &width, &height); Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxbase_override.hpp 20 Dec 2007 02:26:55 -0000 1.13 --- wxbase_override.hpp 22 Dec 2007 06:07:08 -0000 1.14 *************** *** 10,13 **** --- 10,33 ---- // ---------------------------------------------------------------------------- + + %override wxLua_wxLog_SetTimestamp + // static void SetTimestamp(const wxString& ts) + static int LUACALL wxLua_wxLog_SetTimestamp(lua_State *L) + { + // docs say that using NULL will disable time stamping. The actual arg is "const wxChar* ts" + if (lua_isnoneornil(L, 1)) + wxLog::SetTimestamp(NULL); + else + { + // const wxString ts + const wxString ts = wxlua_getwxStringtype(L, 1); + // call SetTimestamp + wxLog::SetTimestamp(ts); + } + + return 0; + } + %end + %override wxLua_function_wxGetOsVersion // %function int wxGetOsVersion(int *major = NULL, int *minor = NULL) *************** *** 52,56 **** wxStandardPathsBase *returns = &wxStandardPaths::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxStandardPaths, returns); return 1; --- 72,76 ---- wxStandardPathsBase *returns = &wxStandardPaths::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStandardPaths); return 1; *************** *** 71,75 **** size_t start = 0; // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call GetMatch bool returns = self->GetMatch(&start, &len, index); --- 91,95 ---- size_t start = 0; // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call GetMatch bool returns = self->GetMatch(&start, &len, index); *************** *** 97,101 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call Replace int returns = self->Replace(&text, replacement, maxMatches); --- 117,121 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call Replace int returns = self->Replace(&text, replacement, maxMatches); *************** *** 118,122 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceAll int returns = self->ReplaceAll(&text, replacement); --- 138,142 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call ReplaceAll int returns = self->ReplaceAll(&text, replacement); *************** *** 139,143 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceFirst int returns = self->ReplaceFirst(&text, replacement); --- 159,163 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call ReplaceFirst int returns = self->ReplaceFirst(&text, replacement); *************** *** 160,164 **** { // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase --- 180,184 ---- { // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase *************** *** 186,190 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 206,210 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 210,214 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 230,234 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 234,238 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 254,258 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 256,260 **** wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstGroup bool returns = self->GetFirstGroup(str, index); --- 276,280 ---- wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetFirstGroup bool returns = self->GetFirstGroup(str, index); *************** *** 280,284 **** wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstEntry bool returns = self->GetFirstEntry(str, index); --- 300,304 ---- wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetFirstEntry bool returns = self->GetFirstEntry(str, index); *************** *** 302,306 **** wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextGroup bool returns = self->GetNextGroup(str, index); --- 322,326 ---- wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetNextGroup bool returns = self->GetNextGroup(str, index); *************** *** 324,328 **** wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextEntry bool returns = self->GetNextEntry(str, index); --- 344,348 ---- wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetNextEntry bool returns = self->GetNextEntry(str, index); *************** *** 355,359 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxString, returns); return 1; --- 375,379 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxString); return 1; *************** *** 370,374 **** wxClassInfo *returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxClassInfo, returns); // return the number of parameters return 1; --- 390,394 ---- wxClassInfo *returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxClassInfo); // return the number of parameters return 1; *************** *** 397,402 **** if (pObject->IsKindOf(pClass->classInfo)) { ! if (*pClass->class_tag != wxluaT_gettag(L, 1)) ! wxluaT_pushuserdatatype(L, *pClass->class_tag, pObject); else lua_pushvalue(L, 1); // return same userdata --- 417,422 ---- if (pObject->IsKindOf(pClass->classInfo)) { ! if (*pClass->wxluatype != wxluaT_type(L, 1)) ! wxluaT_pushuserdatatype(L, pObject, *pClass->wxluatype); else lua_pushvalue(L, 1); // return same userdata *************** *** 405,416 **** } else ! wxlua_error(L, "wxLua: DynamicCast: Unable to cast to a class of this type."); } if (iResult == 0) ! wxlua_error(L, "wxObject:DynamicCast: Class not found."); } else ! wxlua_error(L, "wxObject:DynamicCast: Expected a string name of the class for parameter 2."); return iResult; --- 425,438 ---- } else ! wxlua_argerrormsg(L, wxString::Format(wxT("wxLua: wxObject::DynamicCast() Unable to cast a '%s' to a '%s'."), ! pObject->GetClassInfo()->GetClassName(), lua2wx(className).c_str())); } if (iResult == 0) ! wxlua_argerrormsg(L, wxString::Format(wxT("wxLua: wxObject::DynamicCast() Invalid class to cast a '%s' to '%s'."), ! pObject->GetClassInfo()->GetClassName(), lua2wx(className).c_str())); } else ! wxlua_argerror(L, 2, wxT("a 'string name of the class'")); return iResult; *************** *** 422,426 **** static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { ! wxArrayInt * self = (wxArrayInt *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxArrayInt); wxlua_pushwxArrayInttable(L, *self); return 1; --- 444,448 ---- static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { ! wxArrayInt * self = (wxArrayInt *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxArrayInt); wxlua_pushwxArrayInttable(L, *self); return 1; *************** *** 432,436 **** static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { ! wxArrayString * self = (wxArrayString *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxArrayString); wxlua_pushwxArrayStringtable(L, *self); return 1; --- 454,458 ---- static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { ! wxArrayString * self = (wxArrayString *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxArrayString); wxlua_pushwxArrayStringtable(L, *self); return 1; *************** *** 463,467 **** // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxStringList, returns); // return the number of parameters return 1; --- 485,489 ---- // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStringList); // return the number of parameters return 1; *************** *** 548,552 **** { // get this ! wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetDirs wxArrayString returns = self->GetDirs(); --- 570,574 ---- { // get this ! wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileName); // call GetDirs wxArrayString returns = self->GetDirs(); *************** *** 566,570 **** wxDateTime *dtAccess= new wxDateTime(); // get this ! wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetTimes bool returns = self->GetTimes(dtAccess, dtMod, dtCreate); --- 588,592 ---- wxDateTime *dtAccess= new wxDateTime(); // get this ! wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileName); // call GetTimes bool returns = self->GetTimes(dtAccess, dtMod, dtCreate); *************** *** 574,580 **** wxluaO_addgcobject(L, (void*)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate)); // push the constructed class pointers ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, dtAccess); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, dtMod); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, dtCreate); // push the result flag lua_pushboolean(L, returns); --- 596,602 ---- wxluaO_addgcobject(L, (void*)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate)); // push the constructed class pointers ! wxluaT_pushuserdatatype(L, dtAccess, g_wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtMod, g_wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtCreate, g_wxluatype_wxDateTime); // push the result flag lua_pushboolean(L, returns); *************** *** 668,672 **** wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetFirst bool returns = self->GetFirst(&filename, filespec, flags); --- 690,694 ---- wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxDir); // call GetFirst bool returns = self->GetFirst(&filename, filespec, flags); *************** *** 686,690 **** wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetNext bool returns = self->GetNext(&filename); --- 708,712 ---- wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxDir); // call GetNext bool returns = self->GetNext(&filename); *************** *** 732,736 **** { // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Read unsigned int returns = self->Read(buffer, count); --- 754,758 ---- { // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFile); // call Read unsigned int returns = self->Read(buffer, count); *************** *** 757,761 **** const void *buffer = (const void *)lua_tostring(L, 2); // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Write unsigned int returns = self->Write(buffer, nbytes); --- 779,783 ---- const void *buffer = (const void *)lua_tostring(L, 2); // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFile); // call Write unsigned int returns = self->Write(buffer, nbytes); *************** *** 774,778 **** wxString desc; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetDescription bool returns = (self->GetDescription(&desc)); --- 796,800 ---- wxString desc; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileType); // call GetDescription bool returns = (self->GetDescription(&desc)); *************** *** 790,798 **** { // const wxFileType::MessageParameters params ! const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxFileType_MessageParameters); // wxString printCmd wxString printCmd; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetPrintCommand bool returns = (self->GetPrintCommand(&printCmd, *params)); --- 812,820 ---- { // const wxFileType::MessageParameters params ! const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxFileType_MessageParameters); // wxString printCmd wxString printCmd; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileType); // call GetPrintCommand bool returns = (self->GetPrintCommand(&printCmd, *params)); *************** *** 814,818 **** void *buffer = malloc(size); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxInputStream); if (buffer != NULL) { --- 836,840 ---- void *buffer = malloc(size); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxInputStream); if (buffer != NULL) { *************** *** 821,825 **** self->Read(buffer, size); // only return the data that was read, they already have self ! //wxluaT_pushuserdatatype(L, s_wxluatag_wxInputStream, returns); lua_pushlstring(L, (const char *)buffer, size); free(buffer); --- 843,847 ---- self->Read(buffer, size); // only return the data that was read, they already have self ! //wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxInputStream); lua_pushlstring(L, (const char *)buffer, size); free(buffer); *************** *** 839,843 **** const char *buffer = (const char *)lua_tostring(L, 2); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxInputStream); // call Ungetch size_t returns = self->Ungetch(buffer, size); --- 861,865 ---- const char *buffer = (const char *)lua_tostring(L, 2); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxInputStream); // call Ungetch size_t returns = self->Ungetch(buffer, size); *************** *** 858,866 **** const void *buffer = (void *)lua_tostring(L, 2); // get this ! wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxOutputStream); // call Write wxOutputStream *returns = &self->Write(buffer, size); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxOutputStream, returns); // return the number of parameters return 1; --- 880,888 ---- const void *buffer = (void *)lua_tostring(L, 2); // get this ! wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxOutputStream); // call Write wxOutputStream *returns = &self->Write(buffer, size); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxOutputStream); // return the number of parameters return 1; *************** *** 882,886 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxMemoryInputStream((wxMemoryInputStream*)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMemoryInputStream, returns); return 1; --- 904,908 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxMemoryInputStream((wxMemoryInputStream*)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMemoryInputStream); return 1; Index: wxbase_base.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_base.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbase_base.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxbase_base.i 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 402,406 **** --- 402,411 ---- static void ClearTraceMasks() static const wxArrayString GetTraceMasks() + + // %override static void wxLog::SetTimestamp(const wxString& ts) + // Allows an input of "nil" or no value to disable time stamping. + // C++ Func: static void wxLog::SetTimestamp(const wxChar* ts) static void SetTimestamp(const wxString& ts) + static bool GetVerbose() static wxTraceMask GetTraceMask() Index: wxcore_controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_controls.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxcore_controls.i 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 384,388 **** bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! void AssignImageList(wxImageList *imageList, int which) void ClearAll() bool DeleteAllItems() --- 384,388 ---- bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! void AssignImageList(%ungc wxImageList *imageList, int which) void ClearAll() bool DeleteAllItems() *************** *** 1017,1022 **** wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) //void AssignButtonsImageList(wxImageList* imageList) ! void AssignImageList(wxImageList* imageList) ! void AssignStateImageList(wxImageList* imageList) void Collapse(const wxTreeItemId& item) void CollapseAndReset(const wxTreeItemId& item) --- 1017,1022 ---- wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) //void AssignButtonsImageList(wxImageList* imageList) ! void AssignImageList(%ungc wxImageList* imageList) ! void AssignStateImageList(%ungc wxImageList* imageList) void Collapse(const wxTreeItemId& item) void CollapseAndReset(const wxTreeItemId& item) Index: wxxml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxxml_override.hpp 20 Dec 2007 02:26:55 -0000 1.7 --- wxxml_override.hpp 22 Dec 2007 06:07:08 -0000 1.8 *************** *** 15,21 **** { // wxXmlNode next ! wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, s_wxluatag_wxXmlNode); // wxXmlProperty props ! wxXmlProperty * props = (wxXmlProperty *)wxluaT_getuserdatatype(L, 5, s_wxluatag_wxXmlProperty); // const wxString content const wxString content = wxlua_getwxStringtype(L, 4); --- 15,21 ---- { // wxXmlNode next ! wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxXmlNode); // wxXmlProperty props ! wxXmlProperty * props = (wxXmlProperty *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxXmlProperty); // const wxString content const wxString content = wxlua_getwxStringtype(L, 4); *************** *** 25,29 **** wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2); // wxXmlNode parent ! wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call constructor wxXmlNode *returns = new wxXmlNode(parent, type, name, content, props, next); --- 25,29 ---- wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2); // wxXmlNode parent ! wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call constructor wxXmlNode *returns = new wxXmlNode(parent, type, name, content, props, next); *************** *** 32,36 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlNode, returns); return 1; --- 32,36 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlNode); return 1; *************** *** 43,49 **** { // wxXmlNode child ! wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxXmlNode); // get this ! wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call RemoveChild bool returns = (self->RemoveChild(child)); --- 43,49 ---- { // wxXmlNode child ! wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxXmlNode); // get this ! wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call RemoveChild bool returns = (self->RemoveChild(child)); *************** *** 68,72 **** wxString propName = wxlua_getwxStringtype(L, 2); // get this ! wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call GetPropVal bool returns = self->GetPropVal(propName, &value); --- 68,72 ---- wxString propName = wxlua_getwxStringtype(L, 2); // get this ! wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call GetPropVal bool returns = self->GetPropVal(propName, &value); |
