Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src gdi.cpp, 1.76, 1.77 wx_bind.cpp, 1.114, 1.115
|
From: John L. <jr...@us...> - 2007-06-20 22:57:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/modules/wxbind/src Modified Files: gdi.cpp wx_bind.cpp Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** wx_bind.cpp 19 Jun 2007 22:26:49 -0000 1.114 --- wx_bind.cpp 20 Jun 2007 22:57:36 -0000 1.115 *************** *** 769,776 **** #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, --- 769,776 ---- #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, *************** *** 806,815 **** #endif // wxLUA_USE_wxDC ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxARCH_32", wxARCH_32 }, --- 806,815 ---- #endif // wxLUA_USE_wxDC ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxARCH_32", wxARCH_32 }, *************** *** 6704,6711 **** { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL #if wxLUA_USE_wxApp --- 6704,6711 ---- { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL #if wxLUA_USE_wxApp Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** gdi.cpp 19 Jun 2007 22:26:47 -0000 1.76 --- gdi.cpp 20 Jun 2007 22:57:36 -0000 1.77 *************** *** 14852,14856 **** ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimation --- 14852,14856 ---- ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimation *************** *** 14881,14885 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); --- 14881,14885 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); *************** *** 14905,14909 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; --- 14905,14909 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14926,14930 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); --- 14926,14930 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); *************** *** 14948,14952 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; --- 14948,14952 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14969,14973 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); --- 14969,14973 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); *************** *** 14994,14998 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; --- 14994,14998 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; *************** *** 15020,15027 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_constructor2[] = { &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_constructor2[1] = {{ wxLua_wxAnimation_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxAnimation_constructor2 }}; ! // wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L) { --- 15020,15029 ---- } + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_constructor2[] = { &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_constructor2[1] = {{ wxLua_wxAnimation_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxAnimation_constructor2 }}; ! // %msw wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L) { *************** *** 15045,15048 **** --- 15047,15052 ---- } + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_constructor1[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_constructor1(lua_State *L); *************** *** 15087,15091 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table --- 15091,15095 ---- ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table *************** *** 15093,15097 **** --- 15097,15104 ---- { { wxLua_wxAnimation_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 2, s_wxluaargArray_None }, + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) { wxLua_wxAnimation_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxAnimation_constructor2 }, + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) { wxLua_wxAnimation_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxAnimation_constructor1 }, { wxLua_wxAnimation_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, *************** *** 15106,15110 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions --- 15113,15117 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions *************** *** 15112,15136 **** { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, --- 15119,15143 ---- { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, *************** *** 15139,15146 **** int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl --- 15146,15153 ---- int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl *************** *** 15150,15154 **** int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); --- 15157,15161 ---- int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); *************** *** 15185,15189 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15192,15196 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15209,15213 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); --- 15216,15220 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); *************** *** 15231,15235 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15238,15242 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15335,15339 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); --- 15342,15346 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); *************** *** 15353,15357 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15360,15364 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15371,15375 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); --- 15378,15382 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); *************** *** 15407,15411 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); --- 15414,15418 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); *************** *** 15430,15434 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table --- 15437,15441 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table *************** *** 15448,15454 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table --- 15455,15461 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table *************** *** 15457,15463 **** { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 15464,15470 ---- { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 15471,15506 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxAnimationCtrl_methods[] = { ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Create, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "GetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "IsPlaying", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_IsPlaying, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Play, 1, NULL }, { "SetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "SetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "Stop", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Stop, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "wxAnimationCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload_count, 0 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, --- 15478,15513 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxAnimationCtrl_methods[] = { ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Create, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "GetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "IsPlaying", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_IsPlaying, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Play, 1, NULL }, { "SetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "SetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "Stop", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Stop, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "wxAnimationCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload_count, 0 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, *************** *** 15509,15512 **** int wxAnimationCtrl_methodCount = sizeof(wxAnimationCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL --- 15516,15519 ---- int wxAnimationCtrl_methodCount = sizeof(wxAnimationCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL |
