Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.36, 1.37 clipdrag.cpp, 1.32, 1.33 config.cpp, 1.28, 1.29 controls.cpp, 1.44, 1.45 data.cpp, 1.35, 1.36 datetime.cpp, 1.29, 1.30 defsutil.cpp, 1.25, 1.26 dialogs.cpp, 1.29, 1.30 event.cpp, 1.35, 1.36 file.cpp, 1.34, 1.35 gdi.cpp, 1.50, 1.51 grid.cpp, 1.27, 1.28 help.cpp, 1.24, 1.25 html.cpp, 1.29, 1.30 image.cpp, 1.28, 1.29 mdi.cpp, 1.26, 1.27 menutool.cpp, 1.28, 1.29 print.cpp, 1.29, 1.30 sizer.cpp, 1.24, 1.25 socket.cpp, 1.28, 1.29 wave.cpp, 1.28, 1.29 windows.cpp, 1.41, 1.42 wx_bind.cpp, 1.82, 1.83 wxlua.cpp, 1.29, 1.30 xml.cpp, 1.23, 1.24
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32506/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp sizer.cpp socket.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: update to 2.8 using C++ header files Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** xml.cpp 26 Feb 2007 01:57:05 -0000 1.23 --- xml.cpp 9 Mar 2007 00:15:18 -0000 1.24 *************** *** 240,244 **** wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetParent ! returns = self->GetParent(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); --- 240,244 ---- wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetParent ! returns = (wxXmlNode *)self->GetParent(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); *************** *** 255,259 **** wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetNext ! returns = self->GetNext(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); --- 255,259 ---- wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetNext ! returns = (wxXmlNode *)self->GetNext(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); *************** *** 270,274 **** wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetChildren ! returns = self->GetChildren(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); --- 270,274 ---- wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetChildren ! returns = (wxXmlNode *)self->GetChildren(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); *************** *** 285,289 **** wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetProperties ! returns = self->GetProperties(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); --- 285,289 ---- wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); // call GetProperties ! returns = (wxXmlProperty *)self->GetProperties(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); *************** *** 633,637 **** wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty); // call GetNext ! returns = self->GetNext(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); --- 633,637 ---- wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty); // call GetNext ! returns = (wxXmlProperty *)self->GetNext(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); *************** *** 844,848 **** wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); // call GetRoot ! returns = self->GetRoot(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); --- 844,848 ---- wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); // call GetRoot ! returns = (wxXmlNode *)self->GetRoot(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); *************** *** 1052,1056 **** wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadDialog ! returns = self->LoadDialog(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDialog, returns); --- 1052,1056 ---- wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadDialog ! returns = (wxDialog *)self->LoadDialog(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDialog, returns); *************** *** 1199,1203 **** wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadMenu ! returns = self->LoadMenu(name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenu, returns); --- 1199,1203 ---- wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadMenu ! returns = (wxMenu *)self->LoadMenu(name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenu, returns); *************** *** 1219,1223 **** wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! returns = self->LoadMenuBar(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns); --- 1219,1223 ---- wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! returns = (wxMenuBar *)self->LoadMenuBar(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns); *************** *** 1237,1241 **** wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! returns = self->LoadMenuBar(name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns); --- 1237,1241 ---- wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! returns = (wxMenuBar *)self->LoadMenuBar(name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenuBar, returns); *************** *** 1261,1265 **** wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadToolBar ! returns = self->LoadToolBar(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxToolBar, returns); --- 1261,1265 ---- wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadToolBar ! returns = (wxToolBar *)self->LoadToolBar(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxToolBar, returns); *************** *** 1490,1494 **** wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadPanel ! returns = self->LoadPanel(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPanel, returns); --- 1490,1494 ---- wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); // call LoadPanel ! returns = (wxPanel *)self->LoadPanel(parent, name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPanel, returns); Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** defsutil.cpp 26 Feb 2007 01:57:02 -0000 1.25 --- defsutil.cpp 9 Mar 2007 00:15:14 -0000 1.26 *************** *** 45,49 **** wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); // call GetErrorStream ! returns = self->GetErrorStream(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); --- 45,49 ---- wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); // call GetErrorStream ! returns = (wxInputStream *)self->GetErrorStream(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); *************** *** 60,64 **** wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); // call GetInputStream ! returns = self->GetInputStream(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); --- 60,64 ---- wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); // call GetInputStream ! returns = (wxInputStream *)self->GetInputStream(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); *************** *** 75,79 **** wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); // call GetOutputStream ! returns = self->GetOutputStream(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxOutputStream, returns); --- 75,79 ---- wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); // call GetOutputStream ! returns = (wxOutputStream *)self->GetOutputStream(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxOutputStream, returns); *************** *** 249,253 **** const wxString cmd = wxlState.GetwxStringType(2); // call Open ! returns = wxProcess::Open(cmd, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxProcess, returns); --- 249,253 ---- const wxString cmd = wxlState.GetwxStringType(2); // call Open ! returns = (wxProcess *)wxProcess::Open(cmd, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxProcess, returns); *************** *** 785,788 **** --- 785,849 ---- + #if wxLUA_USE_wxBusyCursor + // --------------------------------------------------------------------------- + // Bind class wxBusyCursorSuspender + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxBusyCursorSuspender' + int s_wxluatag_wxBusyCursorSuspender = -1; + + // wxBusyCursorSuspender() + static int LUACALL wxLua_wxBusyCursorSuspender_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursorSuspender *returns; + // call constructor + returns = new wxBusyCursorSuspender(); + // add to tracked memory list + wxLua_AddTrackedObject(wxlState, (wxBusyCursorSuspender *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxBusyCursorSuspender, returns); + + return 1; + } + + static int LUACALL wxLua_wxBusyCursorSuspender_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursorSuspender * self = (wxBusyCursorSuspender *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyCursorSuspender); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedObject(self); + return 0; + } + + static int LUACALL wxLua_wxBusyCursorSuspender_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursorSuspender * self = (wxBusyCursorSuspender *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyCursorSuspender); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedObject(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + + + // Map Lua Class Methods to C Binding Functions + WXLUAMETHOD wxBusyCursorSuspender_methods[] = { + { LuaConstructor, "wxBusyCursorSuspender", wxLua_wxBusyCursorSuspender_constructor, 0, 0, s_wxluaargArray_None }, + { LuaDelete, "wxBusyCursorSuspender", wxLua_wxBusyCursorSuspender_destructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "Delete", wxLua_wxBusyCursorSuspender_Delete, 0, 0, s_wxluaargArray_None }, + }; + + int wxBusyCursorSuspender_methodCount = sizeof(wxBusyCursorSuspender_methods)/sizeof(wxBusyCursorSuspender_methods[0]); + #endif // wxLUA_USE_wxBusyCursor + + #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO // --------------------------------------------------------------------------- Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxlua.cpp 26 Feb 2007 01:57:05 -0000 1.29 --- wxlua.cpp 9 Mar 2007 00:15:18 -0000 1.30 *************** *** 255,259 **** wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); // call GetID ! returns = self->GetID(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); --- 255,259 ---- wxLuaPrintout * self = (wxLuaPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaPrintout); // call GetID ! returns = (wxLuaObject *)self->GetID(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); *************** *** 408,412 **** wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); // call GetHtmlTag ! returns = self->GetHtmlTag(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxHtmlTag, returns); --- 408,412 ---- wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); // call GetHtmlTag ! returns = (const wxHtmlTag *)self->GetHtmlTag(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxHtmlTag, returns); *************** *** 423,427 **** wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); // call GetHtmlParser ! returns = self->GetHtmlParser(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxHtmlWinParser, returns); --- 423,427 ---- wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); // call GetHtmlParser ! returns = (wxHtmlWinParser *)self->GetHtmlParser(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxHtmlWinParser, returns); Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** image.cpp 2 Mar 2007 05:44:27 -0000 1.28 --- image.cpp 9 Mar 2007 00:15:16 -0000 1.29 *************** *** 537,541 **** const wxString name = wxlState.GetwxStringType(2); // call FindHandler ! returns = wxImage::FindHandler(name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); --- 537,541 ---- const wxString name = wxlState.GetwxStringType(2); // call FindHandler ! returns = (wxImageHandler *)wxImage::FindHandler(name); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); *************** *** 555,559 **** const wxString extension = wxlState.GetwxStringType(2); // call FindHandler ! returns = wxImage::FindHandler(extension, imageType); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); --- 555,559 ---- const wxString extension = wxlState.GetwxStringType(2); // call FindHandler ! returns = (wxImageHandler *)wxImage::FindHandler(extension, imageType); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); *************** *** 571,575 **** long imageType = (long)wxlState.GetNumberType(2); // call FindHandler ! returns = wxImage::FindHandler(imageType); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); --- 571,575 ---- long imageType = (long)wxlState.GetNumberType(2); // call FindHandler ! returns = (wxImageHandler *)wxImage::FindHandler(imageType); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); *************** *** 587,591 **** const wxString mimetype = wxlState.GetwxStringType(2); // call FindHandlerMime ! returns = wxImage::FindHandlerMime(mimetype); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); --- 587,591 ---- const wxString mimetype = wxlState.GetwxStringType(2); // call FindHandlerMime ! returns = (wxImageHandler *)wxImage::FindHandlerMime(mimetype); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImageHandler, returns); Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mdi.cpp 26 Feb 2007 01:57:03 -0000 1.26 --- mdi.cpp 9 Mar 2007 00:15:16 -0000 1.27 *************** *** 69,73 **** wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetWindowMenu ! returns = self->GetWindowMenu(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenu, returns); --- 69,73 ---- wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetWindowMenu ! returns = (wxMenu *)self->GetWindowMenu(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenu, returns); *************** *** 270,274 **** wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetActiveChild ! returns = self->GetActiveChild(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns); --- 270,274 ---- wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetActiveChild ! returns = (wxMDIChildFrame *)self->GetActiveChild(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns); *************** *** 285,289 **** wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetClientWindow ! returns = self->GetClientWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMDIClientWindow, returns); --- 285,289 ---- wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetClientWindow ! returns = (wxMDIClientWindow *)self->GetClientWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMDIClientWindow, returns); *************** *** 300,304 **** wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetToolBar ! returns = self->GetToolBar(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); --- 300,304 ---- wxMDIParentFrame * self = (wxMDIParentFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxMDIParentFrame); // call GetToolBar ! returns = (wxWindow *)self->GetToolBar(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); *************** *** 593,597 **** wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame); // call GetDocument ! returns = self->GetDocument(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); --- 593,597 ---- wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame); // call GetDocument ! returns = (wxDocument *)self->GetDocument(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); *************** *** 608,612 **** wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame); // call GetView ! returns = self->GetView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); --- 608,612 ---- wxDocChildFrame * self = (wxDocChildFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxDocChildFrame); // call GetView ! returns = (wxView *)self->GetView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); *************** *** 682,686 **** #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! // !%wxchkver26 int GetNoHistoryFiles() static int LUACALL wxLua_wxDocManager_GetNoHistoryFiles(lua_State *L) { --- 682,686 ---- #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! // !%wxchkver_2_6 int GetNoHistoryFiles() static int LUACALL wxLua_wxDocManager_GetNoHistoryFiles(lua_State *L) { *************** *** 702,706 **** #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 }; ! // %wxchkver25 void ActivateView(wxView* view, bool activate) static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L) { --- 702,706 ---- #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 }; ! // %wxchkver_2_5 void ActivateView(wxView* view, bool activate) static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L) { *************** *** 722,726 **** #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! // %wxchkver26 size_t GetHistoryFilesCount() const static int LUACALL wxLua_wxDocManager_GetHistoryFilesCount(lua_State *L) { --- 722,726 ---- #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) ! // %wxchkver_2_6 size_t GetHistoryFilesCount() const static int LUACALL wxLua_wxDocManager_GetHistoryFilesCount(lua_State *L) { *************** *** 742,746 **** #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 }; ! // !%wxchkver25 void ActivateView(wxView* view, bool activate, bool deleting) static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L) { --- 742,746 ---- #if (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE) && ((!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDocManager_ActivateView[] = { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 }; ! // !%wxchkver_2_5 void ActivateView(wxView* view, bool activate, bool deleting) static int LUACALL wxLua_wxDocManager_ActivateView(lua_State *L) { *************** *** 806,810 **** wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call GetFileHistory ! returns = self->GetFileHistory(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns); --- 806,810 ---- wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call GetFileHistory ! returns = (wxFileHistory *)self->GetFileHistory(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns); *************** *** 821,825 **** wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call OnCreateFileHistory ! returns = self->OnCreateFileHistory(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns); --- 821,825 ---- wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call OnCreateFileHistory ! returns = (wxFileHistory *)self->OnCreateFileHistory(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns); *************** *** 1018,1022 **** wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call CreateDocument ! returns = self->CreateDocument(path, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); --- 1018,1022 ---- wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call CreateDocument ! returns = (wxDocument *)self->CreateDocument(path, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); *************** *** 1038,1042 **** wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call CreateView ! returns = self->CreateView(doc, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); --- 1038,1042 ---- wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call CreateView ! returns = (wxView *)self->CreateView(doc, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); *************** *** 1083,1087 **** wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call FindTemplateForPath ! returns = self->FindTemplateForPath(path); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns); --- 1083,1087 ---- wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call FindTemplateForPath ! returns = (wxDocTemplate *)self->FindTemplateForPath(path); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns); *************** *** 1098,1102 **** wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call GetCurrentDocument ! returns = self->GetCurrentDocument(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); --- 1098,1102 ---- wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call GetCurrentDocument ! returns = (wxDocument *)self->GetCurrentDocument(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); *************** *** 1113,1117 **** wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call GetCurrentView ! returns = self->GetCurrentView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); --- 1113,1117 ---- wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); // call GetCurrentView ! returns = (wxView *)self->GetCurrentView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); *************** *** 1560,1564 **** wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); // call CreateDocument ! returns = self->CreateDocument(path, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); --- 1560,1564 ---- wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); // call CreateDocument ! returns = (wxDocument *)self->CreateDocument(path, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); *************** *** 1582,1586 **** wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); // call CreateView ! returns = self->CreateView(doc, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); --- 1582,1586 ---- wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); // call CreateView ! returns = (wxView *)self->CreateView(doc, flags); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); *************** *** 1642,1646 **** wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); // call GetDocumentManager ! returns = self->GetDocumentManager(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); --- 1642,1646 ---- wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); // call GetDocumentManager ! returns = (wxDocManager *)self->GetDocumentManager(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); *************** *** 1907,1911 **** wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetCommandProcessor ! returns = self->GetCommandProcessor(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns); --- 1907,1911 ---- wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetCommandProcessor ! returns = (wxCommandProcessor *)self->GetCommandProcessor(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns); *************** *** 1922,1926 **** wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call OnCreateCommandProcessor ! returns = self->OnCreateCommandProcessor(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns); --- 1922,1926 ---- wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call OnCreateCommandProcessor ! returns = (wxCommandProcessor *)self->OnCreateCommandProcessor(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns); *************** *** 2062,2066 **** wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetDocumentTemplate ! returns = self->GetDocumentTemplate(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns); --- 2062,2066 ---- wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetDocumentTemplate ! returns = (wxDocTemplate *)self->GetDocumentTemplate(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns); *************** *** 2077,2081 **** wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetDocumentManager ! returns = self->GetDocumentManager(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); --- 2077,2081 ---- wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetDocumentManager ! returns = (wxDocManager *)self->GetDocumentManager(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); *************** *** 2107,2111 **** wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetDocumentWindow ! returns = self->GetDocumentWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); --- 2107,2111 ---- wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetDocumentWindow ! returns = (wxWindow *)self->GetDocumentWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); *************** *** 2137,2141 **** wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetFirstView ! returns = self->GetFirstView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); --- 2137,2141 ---- wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetFirstView ! returns = (wxView *)self->GetFirstView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxView, returns); *************** *** 2558,2562 **** wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call OnCreatePrintout ! returns = self->OnCreatePrintout(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPrintout, returns); --- 2558,2562 ---- wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call OnCreatePrintout ! returns = (wxPrintout *)self->OnCreatePrintout(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPrintout, returns); *************** *** 2610,2614 **** wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call GetDocument ! returns = self->GetDocument(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); --- 2610,2614 ---- wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call GetDocument ! returns = (wxDocument *)self->GetDocument(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); *************** *** 2625,2629 **** wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call GetDocumentManager ! returns = self->GetDocumentManager(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); --- 2625,2629 ---- wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call GetDocumentManager ! returns = (wxDocManager *)self->GetDocumentManager(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); *************** *** 2640,2644 **** wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call GetFrame ! returns = self->GetFrame(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); --- 2640,2644 ---- wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); // call GetFrame ! returns = (wxWindow *)self->GetFrame(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); *************** *** 2849,2853 **** wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); // call GetEditMenu ! returns = self->GetEditMenu(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenu, returns); --- 2849,2853 ---- wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); // call GetEditMenu ! returns = (wxMenu *)self->GetEditMenu(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxMenu, returns); *************** *** 3167,3171 **** wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); // call GetCurrentCommand ! returns = self->GetCurrentCommand(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxCommand, returns); --- 3167,3171 ---- wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); // call GetCurrentCommand ! returns = (wxCommand *)self->GetCurrentCommand(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxCommand, returns); *************** *** 3229,3233 **** int s_wxluatag_wxCommand = -1; ! // bool CanUndo() static int LUACALL wxLua_wxCommand_CanUndo(lua_State *L) { --- 3229,3233 ---- int s_wxluatag_wxCommand = -1; ! // virtual bool CanUndo() static int LUACALL wxLua_wxCommand_CanUndo(lua_State *L) { *************** *** 3244,3248 **** } ! // bool Do() static int LUACALL wxLua_wxCommand_Do(lua_State *L) { --- 3244,3248 ---- } ! // virtual bool Do() // pure virtual static int LUACALL wxLua_wxCommand_Do(lua_State *L) { *************** *** 3259,3263 **** } ! // wxString GetName() static int LUACALL wxLua_wxCommand_GetName(lua_State *L) { --- 3259,3263 ---- } ! // virtual wxString GetName() static int LUACALL wxLua_wxCommand_GetName(lua_State *L) { *************** *** 3274,3278 **** } ! // bool Undo() static int LUACALL wxLua_wxCommand_Undo(lua_State *L) { --- 3274,3278 ---- } ! // virtual bool Undo() // pure virtual static int LUACALL wxLua_wxCommand_Undo(lua_State *L) { Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** config.cpp 26 Feb 2007 01:57:01 -0000 1.28 --- config.cpp 9 Mar 2007 00:15:13 -0000 1.29 *************** *** 115,119 **** wxConfigBase *returns; // call Create ! returns = wxConfigBase::Create(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns); --- 115,119 ---- wxConfigBase *returns; // call Create ! returns = (wxConfigBase *)wxConfigBase::Create(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns); *************** *** 617,621 **** wxConfigBase * pConfig = (argCount >= 2 ? (wxConfigBase *)wxlState.GetUserDataType(2, s_wxluatag_wxConfigBase) : NULL); // call Set ! returns = wxConfigBase::Set(pConfig); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns); --- 617,621 ---- wxConfigBase * pConfig = (argCount >= 2 ? (wxConfigBase *)wxlState.GetUserDataType(2, s_wxluatag_wxConfigBase) : NULL); // call Set ! returns = (wxConfigBase *)wxConfigBase::Set(pConfig); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxConfigBase, returns); *************** *** 907,908 **** --- 907,988 ---- #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG + + #if wxLUA_USE_wxConfig && wxUSE_CONFIG + // --------------------------------------------------------------------------- + // Bind class wxConfigPathChanger + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxConfigPathChanger' + int s_wxluatag_wxConfigPathChanger = -1; + + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + // %wxchkver_2_8 void UpdateIfDeleted() + static int LUACALL wxLua_wxConfigPathChanger_UpdateIfDeleted(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxConfigPathChanger * self = (wxConfigPathChanger *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigPathChanger); + // call UpdateIfDeleted + self->UpdateIfDeleted(); + + return 0; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigPathChanger_constructor[] = { &s_wxluatag_wxConfigBase, &s_wxluaarg_String, 0 }; + // wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry) + static int LUACALL wxLua_wxConfigPathChanger_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxConfigPathChanger *returns; + // const wxString strEntry + const wxString strEntry = wxlState.GetwxStringType(2); + // const wxConfigBase pContainer + const wxConfigBase * pContainer = (const wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); + // call constructor + returns = new wxConfigPathChanger(pContainer, strEntry); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxConfigPathChanger, returns); + + return 1; + } + + // wxString Name() const + static int LUACALL wxLua_wxConfigPathChanger_Name(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxConfigPathChanger * self = (wxConfigPathChanger *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigPathChanger); + // call Name + returns = self->Name(); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + static int LUACALL wxLua_wxConfigPathChanger_destructor(lua_State *) + { + return 0; + } + + + + // Map Lua Class Methods to C Binding Functions + WXLUAMETHOD wxConfigPathChanger_methods[] = { + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + { LuaMethod, "UpdateIfDeleted", wxLua_wxConfigPathChanger_UpdateIfDeleted, 0, 0, s_wxluaargArray_None }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + + { LuaConstructor, "wxConfigPathChanger", wxLua_wxConfigPathChanger_constructor, 2, 2, s_wxluatagArray_wxLua_wxConfigPathChanger_constructor }, + { LuaMethod, "Name", wxLua_wxConfigPathChanger_Name, 0, 0, s_wxluaargArray_None }, + { LuaDelete, "wxConfigPathChanger", wxLua_wxConfigPathChanger_destructor, 0, 0, s_wxluaargArray_None }, + }; + + int wxConfigPathChanger_methodCount = sizeof(wxConfigPathChanger_methods)/sizeof(wxConfigPathChanger_methods[0]); + #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG + Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** grid.cpp 26 Feb 2007 01:57:02 -0000 1.27 --- grid.cpp 9 Mar 2007 00:15:15 -0000 1.28 *************** *** 575,579 **** wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor); // call GetControl ! returns = self->GetControl(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxControl, returns); --- 575,579 ---- wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor); // call GetControl ! returns = (wxControl *)self->GetControl(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxControl, returns); *************** *** 605,609 **** wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor); // call GetCellAttr ! returns = self->GetCellAttr(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); --- 605,609 ---- wxGridCellEditor * self = (wxGridCellEditor *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellEditor); // call GetCellAttr ! returns = (wxGridCellAttr *)self->GetCellAttr(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); *************** *** 1632,1636 **** wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr); // call GetRenderer ! returns = self->GetRenderer(grid, row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); --- 1632,1636 ---- wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr); // call GetRenderer ! returns = (wxGridCellRenderer *)self->GetRenderer(grid, row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); *************** *** 1654,1658 **** wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr); // call GetEditor ! returns = self->GetEditor(grid, row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); --- 1654,1658 ---- wxGridCellAttr * self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr); // call GetEditor ! returns = (wxGridCellEditor *)self->GetEditor(grid, row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); *************** *** 1811,1815 **** wxGridCellAttrProvider * self = (wxGridCellAttrProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttrProvider); // call GetAttr ! returns = self->GetAttr(row, col, kind); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); --- 1811,1815 ---- wxGridCellAttrProvider * self = (wxGridCellAttrProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttrProvider); // call GetAttr ! returns = (wxGridCellAttr *)self->GetAttr(row, col, kind); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); *************** *** 2229,2233 **** wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase); // call GetView ! returns = self->GetView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGrid, returns); --- 2229,2233 ---- wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase); // call GetView ! returns = (wxGrid *)self->GetView(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGrid, returns); *************** *** 2469,2473 **** wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase); // call GetAttrProvider ! returns = self->GetAttrProvider(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttrProvider, returns); --- 2469,2473 ---- wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase); // call GetAttrProvider ! returns = (wxGridCellAttrProvider *)self->GetAttrProvider(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttrProvider, returns); *************** *** 2506,2510 **** wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase); // call GetAttr ! returns = self->GetAttr(row, col, kind); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); --- 2506,2510 ---- wxGridTableBase * self = (wxGridTableBase *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableBase); // call GetAttr ! returns = (wxGridCellAttr *)self->GetAttr(row, col, kind); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); *************** *** 2723,2727 **** wxGridTableMessage * self = (wxGridTableMessage *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableMessage); // call GetTableObject ! returns = self->GetTableObject(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns); --- 2723,2727 ---- wxGridTableMessage * self = (wxGridTableMessage *)wxlState.GetUserDataType(1, s_wxluatag_wxGridTableMessage); // call GetTableObject ! returns = (wxGridTableBase *)self->GetTableObject(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns); *************** *** 3764,3768 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetTable ! returns = self->GetTable(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns); --- 3764,3768 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetTable ! returns = (wxGridTableBase *)self->GetTable(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridTableBase, returns); *************** *** 5055,5059 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetOrCreateCellAttr ! returns = self->GetOrCreateCellAttr(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); --- 5055,5059 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetOrCreateCellAttr ! returns = (wxGridCellAttr *)self->GetOrCreateCellAttr(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellAttr, returns); *************** *** 5743,5747 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultRenderer ! returns = self->GetDefaultRenderer(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); --- 5743,5747 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultRenderer ! returns = (wxGridCellRenderer *)self->GetDefaultRenderer(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); *************** *** 5763,5767 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetCellRenderer ! returns = self->GetCellRenderer(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); --- 5763,5767 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetCellRenderer ! returns = (wxGridCellRenderer *)self->GetCellRenderer(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); *************** *** 5812,5816 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultEditor ! returns = self->GetDefaultEditor(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); --- 5812,5816 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultEditor ! returns = (wxGridCellEditor *)self->GetDefaultEditor(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); *************** *** 5832,5836 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetCellEditor ! returns = self->GetCellEditor(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); --- 5832,5836 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetCellEditor ! returns = (wxGridCellEditor *)self->GetCellEditor(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); *************** *** 6120,6124 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultEditorForCell ! returns = self->GetDefaultEditorForCell(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); --- 6120,6124 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultEditorForCell ! returns = (wxGridCellEditor *)self->GetDefaultEditorForCell(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); *************** *** 6140,6144 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultRendererForCell ! returns = self->GetDefaultRendererForCell(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); --- 6140,6144 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultRendererForCell ! returns = (wxGridCellRenderer *)self->GetDefaultRendererForCell(row, col); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); *************** *** 6158,6162 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultEditorForType ! returns = self->GetDefaultEditorForType(typeName); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); --- 6158,6162 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultEditorForType ! returns = (wxGridCellEditor *)self->GetDefaultEditorForType(typeName); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellEditor, returns); *************** *** 6176,6180 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultRendererForType ! returns = self->GetDefaultRendererForType(typeName); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); --- 6176,6180 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetDefaultRendererForType ! returns = (wxGridCellRenderer *)self->GetDefaultRendererForType(typeName); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxGridCellRenderer, returns); *************** *** 6208,6212 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridWindow ! returns = self->GetGridWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); --- 6208,6212 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridWindow ! returns = (wxWindow *)self->GetGridWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); *************** *** 6223,6227 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridRowLabelWindow ! returns = self->GetGridRowLabelWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); --- 6223,6227 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridRowLabelWindow ! returns = (wxWindow *)self->GetGridRowLabelWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); *************** *** 6238,6242 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridColLabelWindow ! returns = self->GetGridColLabelWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); --- 6238,6242 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridColLabelWindow ! returns = (wxWindow *)self->GetGridColLabelWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); *************** *** 6253,6257 **** wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridCornerLabelWindow ! returns = self->GetGridCornerLabelWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); --- 6253,6257 ---- wxGrid * self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid); // call GetGridCornerLabelWindow ! returns = (wxWindow *)self->GetGridCornerLabelWindow(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); *************** *** 7293,7297 **** wxGridEditorCreatedEvent * self = (wxGridEditorCreatedEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxGridEditorCreatedEvent); // call GetControl ! returns = self->GetControl(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxControl, returns); --- 7293,7297 ---- wxGridEditorCreatedEvent * self = (wxGridEditorCreatedEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxGridEditorCreatedEvent); // call GetControl ! returns = (wxControl *)self->GetControl(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxControl, returns); Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** file.cpp 8 Mar 2007 06:26:43 -0000 1.34 --- file.cpp 9 Mar 2007 00:15:15 -0000 1.35 *************** *** 2045,2049 **** #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_FindFirst[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT); static int LUACALL wxLua_wxDir_FindFirst(lua_State *L) { --- 2045,2049 ---- #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_FindFirst[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! // %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT) static int LUACALL wxLua_wxDir_FindFirst(lua_State *L) { *************** *** 2348,2352 **** #if (wxCHECK_VERSION(2,5,0)) && (wxUSE_STREAMS) ! // %wxchkver25 wxFileOffset GetLength() const static int LUACALL wxLua_wxStreamBase_GetLength(lua_State *L) { --- 2348,2352 ---- #if (wxCHECK_VERSION(2,5,0)) && (wxUSE_STREAMS) ! // %wxchkver_2_5 wxFileOffset GetLength() const static int LUACALL wxLua_wxStreamBase_GetLength(lua_State *L) { Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** data.cpp 7 Mar 2007 23:56:42 -0000 1.35 --- data.cpp 9 Mar 2007 00:15:14 -0000 1.36 *************** *** 197,201 **** wxObject * self = (wxObject *)wxlState.GetUserDataType(1, s_wxluatag_wxObject); // call GetClassInfo ! returns = self->GetClassInfo(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxClassInfo, returns); --- 197,201 ---- wxObject * self... [truncated message content] |
