Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.61, 1.62 datetime.cpp, 1.50, 1.51 dialogs.cpp, 1.52, 1.53 sizer.cpp, 1.42, 1.43 windows.cpp, 1.68, 1.69 wx_bind.cpp, 1.118, 1.119
|
From: John L. <jr...@us...> - 2007-06-26 03:22:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/modules/wxbind/src Modified Files: appframe.cpp datetime.cpp dialogs.cpp sizer.cpp windows.cpp wx_bind.cpp Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** appframe.cpp 25 Jun 2007 16:07:58 -0000 1.61 --- appframe.cpp 26 Jun 2007 03:22:05 -0000 1.62 *************** *** 27,31 **** ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLog --- 27,31 ---- ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLog *************** *** 147,151 **** ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static int LUACALL wxLua_wxLog_GetRepetitionCounting(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetRepetitionCounting[1] = {{ wxLua_wxLog_GetRepetitionCounting, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; --- 147,151 ---- ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static int LUACALL wxLua_wxLog_GetRepetitionCounting(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetRepetitionCounting[1] = {{ wxLua_wxLog_GetRepetitionCounting, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; *************** *** 162,166 **** } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static int LUACALL wxLua_wxLog_GetTimestamp(lua_State *L); --- 162,166 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static int LUACALL wxLua_wxLog_GetTimestamp(lua_State *L); *************** *** 194,198 **** ! #if (wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetTraceMasks(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetTraceMasks[1] = {{ wxLua_wxLog_GetTraceMasks, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; --- 194,198 ---- ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetTraceMasks(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetTraceMasks[1] = {{ wxLua_wxLog_GetTraceMasks, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; *************** *** 213,217 **** } ! #endif // (wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetVerbose(lua_State *L); --- 213,217 ---- } ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetVerbose(lua_State *L); *************** *** 322,326 **** ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetRepetitionCounting[] = { &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxLog_SetRepetitionCounting(lua_State *L); --- 322,326 ---- ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetRepetitionCounting[] = { &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxLog_SetRepetitionCounting(lua_State *L); *************** *** 339,343 **** } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetTimestamp[] = { &s_wxluaarg_String, NULL }; --- 339,343 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetTimestamp[] = { &s_wxluaarg_String, NULL }; *************** *** 427,440 **** { "GetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "GetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "GetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTimestamp, 1, NULL }, { "GetTraceMask", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMask, 1, NULL }, ! #if (wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetTraceMasks", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMasks, 1, NULL }, ! #endif // (wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetVerbose", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetVerbose, 1, NULL }, --- 427,440 ---- { "GetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "GetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "GetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTimestamp, 1, NULL }, { "GetTraceMask", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMask, 1, NULL }, ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetTraceMasks", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMasks, 1, NULL }, ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetVerbose", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetVerbose, 1, NULL }, *************** *** 446,452 **** { "SetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "SetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "SetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetTimestamp, 1, NULL }, --- 446,452 ---- { "SetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "SetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "SetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetTimestamp, 1, NULL }, *************** *** 461,468 **** int wxLog_methodCount = sizeof(wxLog_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogBuffer --- 461,468 ---- int wxLog_methodCount = sizeof(wxLog_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogBuffer *************** *** 538,545 **** int wxLogBuffer_methodCount = sizeof(wxLogBuffer_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogChain --- 538,545 ---- int wxLogBuffer_methodCount = sizeof(wxLogBuffer_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogChain *************** *** 673,680 **** int wxLogChain_methodCount = sizeof(wxLogChain_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogNull --- 673,738 ---- int wxLogChain_methodCount = sizeof(wxLogChain_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) ! // --------------------------------------------------------------------------- ! // Bind class wxLogGui ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxLogGui' ! int s_wxluatag_wxLogGui = -1; ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogGui_delete[] = { &s_wxluatag_wxLogGui, NULL }; ! static int LUACALL wxLua_wxLogGui_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogGui_delete[1] = {{ wxLua_wxLogGui_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogGui_delete }}; ! static int LUACALL wxLua_wxLogGui_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! static int LUACALL wxLua_wxLogGui_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogGui_constructor[1] = {{ wxLua_wxLogGui_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; ! // wxLogGui() ! static int LUACALL wxLua_wxLogGui_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxLogGui *returns; ! // call constructor ! returns = new wxLogGui(); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLogGui((wxLogGui *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLogGui, returns); ! ! return 1; ! } ! ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLogGui_methods[] = { ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLogGui_delete, 1, NULL }, ! { "wxLogGui", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLogGui_constructor, 1, NULL }, ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxLogGui_methodCount = sizeof(wxLogGui_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) ! ! ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogNull *************** *** 731,738 **** int wxLogNull_methodCount = sizeof(wxLogNull_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogPassThrough --- 789,796 ---- int wxLogNull_methodCount = sizeof(wxLogNull_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogPassThrough *************** *** 789,793 **** int wxLogPassThrough_methodCount = sizeof(wxLogPassThrough_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG --- 847,1134 ---- int wxLogPassThrough_methodCount = sizeof(wxLogPassThrough_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! ! ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) ! // --------------------------------------------------------------------------- ! // Bind class wxLogTextCtrl ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxLogTextCtrl' ! int s_wxluatag_wxLogTextCtrl = -1; ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogTextCtrl_delete[] = { &s_wxluatag_wxLogTextCtrl, NULL }; ! static int LUACALL wxLua_wxLogTextCtrl_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogTextCtrl_delete[1] = {{ wxLua_wxLogTextCtrl_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogTextCtrl_delete }}; ! static int LUACALL wxLua_wxLogTextCtrl_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! ! #if (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogTextCtrl_constructor[] = { &s_wxluatag_wxTextCtrl, NULL }; ! static int LUACALL wxLua_wxLogTextCtrl_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogTextCtrl_constructor[1] = {{ wxLua_wxLogTextCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxLogTextCtrl_constructor }}; ! // wxLogTextCtrl(wxTextCtrl* textCtrl); ! static int LUACALL wxLua_wxLogTextCtrl_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxLogTextCtrl *returns; ! // wxTextCtrl textCtrl ! wxTextCtrl * textCtrl = (wxTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxTextCtrl); ! // call constructor ! returns = new wxLogTextCtrl(textCtrl); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLogTextCtrl((wxLogTextCtrl *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLogTextCtrl, returns); ! ! return 1; ! } ! ! #endif // (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLogTextCtrl_methods[] = { ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLogTextCtrl_delete, 1, NULL }, ! ! #if (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! { "wxLogTextCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLogTextCtrl_constructor, 1, NULL }, ! #endif // (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxLogTextCtrl_methodCount = sizeof(wxLogTextCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) ! ! ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) ! // --------------------------------------------------------------------------- ! // Bind class wxLogWindow ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxLogWindow' ! int s_wxluatag_wxLogWindow = -1; ! ! #if (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_GetFrame[] = { &s_wxluatag_wxLogWindow, NULL }; ! static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_GetFrame[1] = {{ wxLua_wxLogWindow_GetFrame, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_GetFrame }}; ! // wxFrame * GetFrame() const ! static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxFrame *returns; ! // get this ! wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); ! // call GetFrame ! returns = (wxFrame *)self->GetFrame(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxFrame, returns); ! ! return 1; ! } ! ! #endif // (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_Show[] = { &s_wxluatag_wxLogWindow, &s_wxluaarg_Boolean, NULL }; ! static int LUACALL wxLua_wxLogWindow_Show(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_Show[1] = {{ wxLua_wxLogWindow_Show, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLogWindow_Show }}; ! // void Show(bool show = true) ! static int LUACALL wxLua_wxLogWindow_Show(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool show = true ! bool show = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); ! // get this ! wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); ! // call Show ! self->Show(show); ! ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_delete[] = { &s_wxluatag_wxLogWindow, NULL }; ! static int LUACALL wxLua_wxLogWindow_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_delete[1] = {{ wxLua_wxLogWindow_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_delete }}; ! static int LUACALL wxLua_wxLogWindow_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; ! static int LUACALL wxLua_wxLogWindow_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_constructor[1] = {{ wxLua_wxLogWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 4, s_wxluatagArray_wxLua_wxLogWindow_constructor }}; ! // wxLogWindow(wxWindow *pParent, const wxString& szTitle, bool bShow = true, bool bPassToOld = true); ! static int LUACALL wxLua_wxLogWindow_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxLogWindow *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool bPassToOld = true ! bool bPassToOld = (argCount >= 4 ? wxlua_getbooleantype(L, 4) : true); ! // bool bShow = true ! bool bShow = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : true); ! // const wxString szTitle ! const wxString szTitle = wxlState.GetwxStringType(2); ! // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); ! // call constructor ! returns = new wxLogWindow(pParent, szTitle, bShow, bPassToOld); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLogWindow((wxLogWindow *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLogWindow, returns); ! ! return 1; ! } ! ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLogWindow_methods[] = { ! #if (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLogWindow_GetFrame, 1, NULL }, ! #endif // (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! ! { "Show", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLogWindow_Show, 1, NULL }, ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLogWindow_delete, 1, NULL }, ! { "wxLogWindow", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLogWindow_constructor, 1, NULL }, ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxLogWindow_methodCount = sizeof(wxLogWindow_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) ! ! ! #if wxUSE_SNGLINST_CHECKER ! // --------------------------------------------------------------------------- ! // Bind class wxSingleInstanceChecker ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxSingleInstanceChecker' ! int s_wxluatag_wxSingleInstanceChecker = -1; ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleInstanceChecker_Create[] = { &s_wxluatag_wxSingleInstanceChecker, &s_wxluaarg_String, &s_wxluaarg_String, NULL }; ! static int LUACALL wxLua_wxSingleInstanceChecker_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_Create[1] = {{ wxLua_wxSingleInstanceChecker_Create, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxSingleInstanceChecker_Create }}; ! // bool Create(const wxString& name, const wxString& path = "") ! static int LUACALL wxLua_wxSingleInstanceChecker_Create(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // const wxString path = "" ! const wxString path = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); ! // const wxString name ! const wxString name = wxlState.GetwxStringType(2); ! // get this ! wxSingleInstanceChecker * self = (wxSingleInstanceChecker *)wxlState.GetUserDataType(1, s_wxluatag_wxSingleInstanceChecker); ! // call Create ! returns = (self->Create(name, path)); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleInstanceChecker_IsAnotherRunning[] = { &s_wxluatag_wxSingleInstanceChecker, NULL }; ! static int LUACALL wxLua_wxSingleInstanceChecker_IsAnotherRunning(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_IsAnotherRunning[1] = {{ wxLua_wxSingleInstanceChecker_IsAnotherRunning, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxSingleInstanceChecker_IsAnotherRunning }}; ! // bool IsAnotherRunning() const // is another copy of this program already running? ! static int LUACALL wxLua_wxSingleInstanceChecker_IsAnotherRunning(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxSingleInstanceChecker * self = (wxSingleInstanceChecker *)wxlState.GetUserDataType(1, s_wxluatag_wxSingleInstanceChecker); ! // call IsAnotherRunning ! returns = (self->IsAnotherRunning()); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleInstanceChecker_delete[] = { &s_wxluatag_wxSingleInstanceChecker, NULL }; ! static int LUACALL wxLua_wxSingleInstanceChecker_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_delete[1] = {{ wxLua_wxSingleInstanceChecker_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSingleInstanceChecker_delete }}; ! static int LUACALL wxLua_wxSingleInstanceChecker_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxSingleInstanceChecker * self = (wxSingleInstanceChecker *)wxlState.GetUserDataType(1, s_wxluatag_wxSingleInstanceChecker); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! static int LUACALL wxLua_wxSingleInstanceChecker_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_constructor[1] = {{ wxLua_wxSingleInstanceChecker_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; ! // wxSingleInstanceChecker() // default ctor, use Create() after it ! static int LUACALL wxLua_wxSingleInstanceChecker_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxSingleInstanceChecker *returns; ! // call constructor ! returns = new wxSingleInstanceChecker(); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSingleInstanceChecker((wxSingleInstanceChecker *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxSingleInstanceChecker, returns); ! ! return 1; ! } ! ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxSingleInstanceChecker_methods[] = { ! { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxSingleInstanceChecker_Create, 1, NULL }, ! { "IsAnotherRunning", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxSingleInstanceChecker_IsAnotherRunning, 1, NULL }, ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxSingleInstanceChecker_delete, 1, NULL }, ! { "wxSingleInstanceChecker", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxSingleInstanceChecker_constructor, 1, NULL }, ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxSingleInstanceChecker_methodCount = sizeof(wxSingleInstanceChecker_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // wxUSE_SNGLINST_CHECKER Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** datetime.cpp 25 Jun 2007 03:19:42 -0000 1.50 --- datetime.cpp 26 Jun 2007 03:22:06 -0000 1.51 *************** *** 3873,3876 **** --- 3873,4005 ---- + #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + // --------------------------------------------------------------------------- + // Bind class wxStopWatch + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxStopWatch' + int s_wxluatag_wxStopWatch = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Pause[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_Pause(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Pause[1] = {{ wxLua_wxStopWatch_Pause, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_Pause }}; + // void Pause() + static int LUACALL wxLua_wxStopWatch_Pause(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Pause + self->Pause(); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Resume[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_Resume(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Resume[1] = {{ wxLua_wxStopWatch_Resume, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_Resume }}; + // void Resume() + static int LUACALL wxLua_wxStopWatch_Resume(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Resume + self->Resume(); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Start[] = { &s_wxluatag_wxStopWatch, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxStopWatch_Start(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Start[1] = {{ wxLua_wxStopWatch_Start, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxStopWatch_Start }}; + // void Start(long t0 = 0) // start the stop watch at the moment t0 + static int LUACALL wxLua_wxStopWatch_Start(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // long t0 = 0 + long t0 = (argCount >= 2 ? (long)wxlua_getnumbertype(L, 2) : 0); + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Start + self->Start(t0); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Time[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_Time(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Time[1] = {{ wxLua_wxStopWatch_Time, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_Time }}; + // long Time() const + static int LUACALL wxLua_wxStopWatch_Time(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Time + returns = (self->Time()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_delete[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_delete[1] = {{ wxLua_wxStopWatch_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_delete }}; + static int LUACALL wxLua_wxStopWatch_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + static int LUACALL wxLua_wxStopWatch_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_constructor[1] = {{ wxLua_wxStopWatch_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxStopWatch() // ctor starts the stop watch + static int LUACALL wxLua_wxStopWatch_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxStopWatch *returns; + // call constructor + returns = new wxStopWatch(); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxStopWatch((wxStopWatch *)returns)); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxStopWatch, returns); + + return 1; + } + + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxStopWatch_methods[] = { + { "Pause", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Pause, 1, NULL }, + { "Resume", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Resume, 1, NULL }, + { "Start", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Start, 1, NULL }, + { "Time", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Time, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxStopWatch_delete, 1, NULL }, + { "wxStopWatch", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxStopWatch_constructor, 1, NULL }, + + { 0, 0, 0, 0 }, + }; + + int wxStopWatch_methodCount = sizeof(wxStopWatch_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + + #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL // --------------------------------------------------------------------------- Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** dialogs.cpp 25 Jun 2007 03:19:42 -0000 1.52 --- dialogs.cpp 26 Jun 2007 03:22:07 -0000 1.53 *************** *** 72,76 **** #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateButtonSizer(lua_State *L); --- 72,76 ---- #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateButtonSizer(lua_State *L); *************** *** 93,99 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateSeparatedButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateSeparatedButtonSizer(lua_State *L); --- 93,99 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateSeparatedButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateSeparatedButtonSizer(lua_State *L); *************** *** 116,122 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateStdDialogButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateStdDialogButtonSizer(lua_State *L); --- 116,122 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateStdDialogButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateStdDialogButtonSizer(lua_State *L); *************** *** 139,145 **** } ! #endif // ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateTextSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDialog_CreateTextSizer(lua_State *L); --- 139,145 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateTextSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDialog_CreateTextSizer(lua_State *L); *************** *** 162,166 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_EndModal[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; --- 162,166 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_EndModal[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; *************** *** 341,359 **** #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateButtonSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateSeparatedButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateSeparatedButtonSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateStdDialogButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateStdDialogButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "CreateTextSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateTextSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "EndModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_EndModal, 1, NULL }, --- 341,359 ---- #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateSeparatedButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateSeparatedButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateStdDialogButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateStdDialogButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "CreateTextSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateTextSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "EndModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_EndModal, 1, NULL }, *************** *** 3907,3911 **** ! #if (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) static wxLuaArgTag s_wxluatagArray_wxLua_wxWizard_GetPageAreaSizer[] = { &s_wxluatag_wxWizard, NULL }; static int LUACALL wxLua_wxWizard_GetPageAreaSizer(lua_State *L); --- 3907,3911 ---- ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) static wxLuaArgTag s_wxluatagArray_wxLua_wxWizard_GetPageAreaSizer[] = { &s_wxluatag_wxWizard, NULL }; static int LUACALL wxLua_wxWizard_GetPageAreaSizer(lua_State *L); *************** *** 3926,3930 **** } ! #endif // (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) --- 3926,3930 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) *************** *** 4138,4144 **** { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetCurrentPage, 1, NULL }, ! #if (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) { "GetPageAreaSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetPageAreaSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) --- 4138,4144 ---- { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetCurrentPage, 1, NULL }, ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) { "GetPageAreaSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetPageAreaSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** windows.cpp 25 Jun 2007 03:19:49 -0000 1.68 --- windows.cpp 26 Jun 2007 03:22:07 -0000 1.69 *************** *** 85,88 **** --- 85,146 ---- // --------------------------------------------------------------------------- + // Bind class wxWindowUpdateLocker + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxWindowUpdateLocker' + int s_wxluatag_wxWindowUpdateLocker = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindowUpdateLocker_delete[] = { &s_wxluatag_wxWindowUpdateLocker, NULL }; + static int LUACALL wxLua_wxWindowUpdateLocker_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindowUpdateLocker_delete[1] = {{ wxLua_wxWindowUpdateLocker_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxWindowUpdateLocker_delete }}; + static int LUACALL wxLua_wxWindowUpdateLocker_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxWindowUpdateLocker * self = (wxWindowUpdateLocker *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowUpdateLocker); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindowUpdateLocker_constructor[] = { &s_wxluatag_wxWindow, NULL }; + static int LUACALL wxLua_wxWindowUpdateLocker_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindowUpdateLocker_constructor[1] = {{ wxLua_wxWindowUpdateLocker_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxWindowUpdateLocker_constructor }}; + // wxWindowUpdateLocker(wxWindow *winToLock = NULL) + static int LUACALL wxLua_wxWindowUpdateLocker_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxWindowUpdateLocker *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow winToLock = NULL + wxWindow * winToLock = (argCount >= 1 ? (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow) : NULL); + // call constructor + returns = new wxWindowUpdateLocker(winToLock); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxWindowUpdateLocker((wxWindowUpdateLocker *)returns)); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWindowUpdateLocker, returns); + + return 1; + } + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxWindowUpdateLocker_methods[] = { + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxWindowUpdateLocker_delete, 1, NULL }, + { "wxWindowUpdateLocker", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxWindowUpdateLocker_constructor, 1, NULL }, + { 0, 0, 0, 0 }, + }; + + int wxWindowUpdateLocker_methodCount = sizeof(wxWindowUpdateLocker_methods)/sizeof(wxLuaBindMethod) - 1; + + + // --------------------------------------------------------------------------- // Bind class wxVisualAttributes // --------------------------------------------------------------------------- *************** *** 1160,1164 **** ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetConstraints[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetConstraints(lua_State *L); --- 1218,1222 ---- ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetConstraints[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetConstraints(lua_State *L); *************** *** 1179,1185 **** } ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetContainingSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetContainingSizer(lua_State *L); --- 1237,1243 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetContainingSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetContainingSizer(lua_State *L); *************** *** 1200,1204 **** } ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 1258,1262 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 1393,1415 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetHandle[] = { &s_wxluatag_wxWindow, NULL }; - static int LUACALL wxLua_wxWindow_GetHandle(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_GetHandle[1] = {{ wxLua_wxWindow_GetHandle, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxWindow_GetHandle }}; - // %override wxLua_wxWindow_GetHandle - // void *GetHandle() const - static int LUACALL wxLua_wxWindow_GetHandle(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxWindow *self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); - // call GetHandle - void *handle = (void *)self->GetHandle(); - // push handle - lua_pushlightuserdata(L, handle); - // return the number of parameters - return 1; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetHelpText[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetHelpText(lua_State *L); --- 1451,1454 ---- *************** *** 1795,1799 **** ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetSizer(lua_State *L); --- 1834,1838 ---- ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetSizer(lua_State *L); *************** *** 1814,1818 **** } ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxFont --- 1853,1857 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxFont *************** *** 2930,2934 **** ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetConstraints[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxLayoutConstraints, NULL }; static int LUACALL wxLua_wxWindow_SetConstraints(lua_State *L); --- 2969,2973 ---- ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetConstraints[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxLayoutConstraints, NULL }; static int LUACALL wxLua_wxWindow_SetConstraints(lua_State *L); *************** *** 2948,2954 **** } ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetContainingSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, NULL }; static int LUACALL wxLua_wxWindow_SetContainingSizer(lua_State *L); --- 2987,2993 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetContainingSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, NULL }; static int LUACALL wxLua_wxWindow_SetContainingSizer(lua_State *L); *************** *** 2968,2972 **** } ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 3007,3011 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 3481,3485 **** ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxWindow_SetSizer(lua_State *L); --- 3520,3524 ---- ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxWindow_SetSizer(lua_State *L); *************** *** 3524,3528 **** } ! #endif // wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetThemeEnabled[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; --- 3563,3567 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetThemeEnabled[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; *************** *** 4421,4431 **** { "GetClientSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetClientSizeWH, 1, NULL }, ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) { "GetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetConstraints, 1, NULL }, ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer { "GetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetContainingSizer, 1, NULL }, ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 4460,4470 ---- { "GetClientSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetClientSizeWH, 1, NULL }, ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) { "GetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetConstraints, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "GetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetContainingSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 4455,4459 **** { "GetGrandParent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetGrandParent, 1, NULL }, - { "GetHandle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetHandle, 1, NULL }, { "GetHelpText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetHelpText, 1, NULL }, { "GetId", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetId, 1, NULL }, --- 4494,4497 ---- *************** *** 4495,4501 **** { "GetSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizeWH, 1, NULL }, ! #if wxLUA_USE_wxSizer { "GetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizer, 1, NULL }, ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxFont --- 4533,4539 ---- { "GetSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizeWH, 1, NULL }, ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "GetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxFont *************** *** 4610,4620 **** #endif // (wxLUA_USE_wxPointSizeRect) ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) { "SetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetConstraints, 1, NULL }, ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer { "SetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetContainingSizer, 1, NULL }, ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 4648,4658 ---- #endif // (wxLUA_USE_wxPointSizeRect) ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) { "SetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetConstraints, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "SetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetContainingSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 4673,4680 **** #endif // (wxLUA_USE_wxPointSizeRect) ! #if wxLUA_USE_wxSizer { "SetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizer, 1, NULL }, { "SetSizerAndFit", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizerAndFit, 1, NULL }, ! #endif // wxLUA_USE_wxSizer { "SetThemeEnabled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetThemeEnabled, 1, NULL }, --- 4711,4718 ---- #endif // (wxLUA_USE_wxPointSizeRect) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "SetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizer, 1, NULL }, { "SetSizerAndFit", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizerAndFit, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "SetThemeEnabled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetThemeEnabled, 1, NULL }, *************** *** 5247,5251 **** #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetControlSizer[] = { &s_wxluatag_wxBookCtrlBase, NULL }; static int LUACALL wxLua_wxBookCtrlBase_GetControlSizer(lua_State *L); --- 5285,5289 ---- #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetControlSizer[] = { &s_wxluatag_wxBookCtrlBase, NULL }; static int LUACALL wxLua_wxBookCtrlBase_GetControlSizer(lua_State *L); *************** *** 5266,5270 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetCurrentPage[] = { &s_wxluatag_wxBookCtrlBase, NULL }; --- 5304,5308 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetCurrentPage[] = { &s_wxluatag_wxBookCtrlBase, NULL }; *************** *** 5704,5710 **** #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetControlSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetControlSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetCurrentPage, 1, NULL }, --- 5742,5748 ---- #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetControlSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetControlSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetCurrentPage, 1, NULL }, Index: sizer.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/sizer.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** sizer.cpp 18 Jun 2007 21:40:49 -0000 1.42 --- sizer.cpp 26 Jun 2007 03:22:07 -0000 1.43 *************** *** 27,31 **** ! #if wxLUA_USE_wxSizer // --------------------------------------------------------------------------- // Bind class wxSizerItem --- 27,532 ---- ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) ! // --------------------------------------------------------------------------- [...2419 lines suppressed...] --- 5107,5114 ---- int wxLayoutConstraints_methodCount = sizeof(wxLayoutConstraints_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) ! #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) // --------------------------------------------------------------------------- // Bind class wxIndividualLayoutConstraint *************** *** 4857,4860 **** int wxIndividualLayoutConstraint_methodCount = sizeof(wxIndividualLayoutConstraint_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) --- 5360,5363 ---- int wxIndividualLayoutConstraint_methodCount = sizeof(wxIndividualLayoutConstraint_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** wx_bind.cpp 25 Jun 2007 03:19:49 -0000 1.118 --- wx_bind.cpp 26 Jun 2007 03:22:07 -0000 1.119 *************** *** 818,826 **** { "wxARE_FILENAMES_CASE_SENSITIVE", wxARE_FILENAMES_CASE_SENSITIVE }, ! #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) { "wxAbove", wxAbove }, { "wxAbsolute", wxAbsolute }, { "wxAsIs", wxAsIs }, ! #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) { "wxBACKINGSTORE", wxBACKINGSTORE }, --- 818,826 ---- { "wxARE_FILENAMES_CASE_SENSITIVE", wxARE_FILENAMES_CASE_SENSITIVE }, ! #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) { "wxAbove", wxAbove }, { "wxAbsolute", wxAbsolute }, { "wxAsIs", wxAsIs }, ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) { "wxBACKINGSTORE", wxBACKINGSTORE }, *************** *** 957,964 **** #endif // wxLUA_USE_wxButton && wxUSE_BUTTON ! #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) { "wxBelow", wxBelow }, { "wxBottom", wxBottom }, ! #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) --- 957,964 ---- #endif // wxLUA_USE_wxButton && wxUSE_BUTTON ! #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) { "wxBelow", wxBelow }, { "wxBottom", wxBottom }, ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) #if (wxLUA_USE_wxColourPenBrush) && (... [truncated message content] |
