Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.25, 1.26 wxluacan.h, 1.22, 1.23 wxluacan.i, 1.9, 1.10 wxluacan_bind.cpp, 1.17, 1.18
|
From: John L. <jr...@us...> - 2007-05-31 17:19:19
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan.i wxluacan_bind.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluacan.cpp 19 Mar 2007 03:47:17 -0000 1.25 --- wxluacan.cpp 31 May 2007 17:18:45 -0000 1.26 *************** *** 28,31 **** --- 28,34 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; + static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }}; + // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) *************** *** 42,45 **** --- 45,51 ---- } + static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }}; + // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) *************** *** 57,60 **** --- 63,69 ---- } + static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }}; + // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) *************** *** 75,78 **** --- 84,90 ---- #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 }; + static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }}; + // void SetBrush( const wxBrush& brush ) static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) *************** *** 90,93 **** --- 102,108 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 }; + static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }}; + // void SetPen( const wxPen& pen ) static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) *************** *** 107,110 **** --- 122,128 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, 0, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPending }}; + // void SetPending( bool pending = true ) static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) *************** *** 114,118 **** int argCount = lua_gettop(L); // bool pending = true ! bool pending = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); --- 132,136 ---- int argCount = lua_gettop(L); // bool pending = true ! bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); *************** *** 124,127 **** --- 142,148 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }}; + // void SetPos( double x, double y ) static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) *************** *** 129,135 **** wxLuaState wxlState(L); // double y ! double y = (double)wxlState.GetNumberType(3); // double x ! double x = (double)wxlState.GetNumberType(2); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); --- 150,156 ---- wxLuaState wxlState(L); // double y ! double y = (double)wxlua_getnumbertype(L, 3); // double x ! double x = (double)wxlua_getnumbertype(L, 2); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); *************** *** 141,147 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObj *returns; --- 162,172 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }}; ! ! // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObj *returns; *************** *** 149,155 **** int argCount = lua_gettop(L); // double y = 0 ! double y = (argCount >= 2 ? (double)wxlState.GetNumberType(2) : 0); // double x = 0 ! double x = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0); // call constructor returns = new wxlCanObj(x, y); --- 174,180 ---- int argCount = lua_gettop(L); // double y = 0 ! double y = (argCount >= 2 ? (double)wxlua_getnumbertype(L, 2) : 0); // double x = 0 ! double x = (argCount >= 1 ? (double)wxlua_getnumbertype(L, 1) : 0); // call constructor returns = new wxlCanObj(x, y); *************** *** 164,184 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }, ! { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxColourPenBrush ! { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }, ! { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }, #endif // wxLUA_USE_wxColourPenBrush ! { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending }, ! { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, ! { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjRect --- 189,216 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCanObj_AddObject, 1 }, ! { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxlCanObj_GetX, 1 }, ! { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxlCanObj_GetY, 1 }, #if wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetBrush", s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1 }, ! { WXLUAMETHOD_METHOD, "SetPen", s_wxluafunc_wxLua_wxlCanObj_SetPen, 1 }, #endif // wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetPending", s_wxluafunc_wxLua_wxlCanObj_SetPending, 1 }, ! { WXLUAMETHOD_METHOD, "SetPos", s_wxluafunc_wxLua_wxlCanObj_SetPos, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObj", s_wxluafunc_wxLua_wxlCanObj_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1; + + WXLUADEFINE wxlCanObj_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxlCanObj_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjRect *************** *** 189,205 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjRect *returns; // double h ! double h = (double)wxlState.GetNumberType(4); // double w ! double w = (double)wxlState.GetNumberType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjRect(x, y, w, h); --- 221,241 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }}; ! ! // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjRect *returns; // double h ! double h = (double)wxlua_getnumbertype(L, 4); // double w ! double w = (double)wxlua_getnumbertype(L, 3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjRect(x, y, w, h); *************** *** 214,223 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjRect_methods[] = { ! { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjCircle --- 250,266 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjRect_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjRect", s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1; + + WXLUADEFINE wxlCanObjRect_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxlCanObjRect_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjCircle *************** *** 228,242 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjCircle *returns; // double r ! double r = (double)wxlState.GetNumberType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjCircle(x, y, r); --- 271,289 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }}; ! ! // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjCircle *returns; // double r ! double r = (double)wxlua_getnumbertype(L, 3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjCircle(x, y, r); *************** *** 251,260 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjCircle_methods[] = { ! { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjScript --- 298,314 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjCircle_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjCircle", s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1; + + WXLUADEFINE wxlCanObjCircle_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxlCanObjCircle_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjScript *************** *** 265,271 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjScript *returns; --- 319,329 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }}; ! ! // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjScript *returns; *************** *** 273,279 **** const wxString name = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjScript(x, y, name); --- 331,337 ---- const wxString name = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjScript(x, y, name); *************** *** 288,297 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjScript_methods[] = { ! { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjAddScript --- 346,362 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjScript_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjScript", s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1; + + WXLUADEFINE wxlCanObjScript_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxlCanObjScript_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjAddScript *************** *** 302,305 **** --- 367,373 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }}; + // void SetScript( const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) *************** *** 317,323 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjAddScript *returns; --- 385,395 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }}; ! ! // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjAddScript *returns; *************** *** 325,331 **** const wxString script = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjAddScript(x, y, script); --- 397,403 ---- const wxString script = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjAddScript(x, y, script); *************** *** 340,350 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { ! { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }, ! { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCan --- 412,429 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { ! { WXLUAMETHOD_METHOD, "SetScript", s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjAddScript", s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1; + + WXLUADEFINE wxlCanObjAddScript_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxlCanObjAddScript_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCan *************** *** 355,358 **** --- 434,440 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; + static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }}; + // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCan_AddObject(lua_State *L) *************** *** 369,372 **** --- 451,457 ---- } + static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }}; + // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) *************** *** 384,387 **** --- 469,475 ---- } + static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }}; + // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) *************** *** 402,408 **** #if wxLUA_USE_wxPointSizeRect static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 }; ! // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCan *returns; --- 490,500 ---- #if wxLUA_USE_wxPointSizeRect static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 }; ! static int LUACALL wxLua_wxlCan_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }}; ! ! // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCan *returns; *************** *** 414,418 **** const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 506,510 ---- const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); *************** *** 431,447 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCan_methods[] = { ! { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }, ! { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, s_wxluatagArray_wxLua_wxlCan_constructor }, #endif // wxLUA_USE_wxPointSizeRect ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlLuaCanCmd --- 523,546 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCan_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCan_AddObject, 1 }, ! { WXLUAMETHOD_METHOD, "GetCmdh", s_wxluafunc_wxLua_wxlCan_GetCmdh, 1 }, ! { WXLUAMETHOD_METHOD, "GetYaxis", s_wxluafunc_wxLua_wxlCan_GetYaxis, 1 }, #if wxLUA_USE_wxPointSizeRect ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCan", s_wxluafunc_wxLua_wxlCan_constructor, 1 }, #endif // wxLUA_USE_wxPointSizeRect ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1; + + WXLUADEFINE wxlCan_enums[] = { + { NULL, 0, }, + }; + + int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxlCan_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlLuaCanCmd *************** *** 452,455 **** --- 551,557 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }}; + // void MoveObject( int index, double x, double y ) static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) *************** *** 457,465 **** wxLuaState wxlState(L); // double y ! double y = (double)wxlState.GetNumberType(4); // double x ! double x = (double)wxlState.GetNumberType(3); // int index ! int index = (int)wxlState.GetNumberType(2); // get this wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd); --- 559,567 ---- wxLuaState wxlState(L); // double y ! double y = (double)wxlua_getnumbertype(L, 4); // double x ! double x = (double)wxlua_getnumbertype(L, 3); // int index ! int index = (int)wxlua_getnumbertype(L, 2); // get this wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd); *************** *** 471,477 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 }; ! // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) { wxLuaState wxlState(L); wxlLuaCanCmd *returns; --- 573,583 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }}; ! ! // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlLuaCanCmd *returns; *************** *** 479,483 **** int argCount = lua_gettop(L); // int maxCommands = -1 ! int maxCommands = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); // wxlCan canvas wxlCan * canvas = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); --- 585,589 ---- int argCount = lua_gettop(L); // int maxCommands = -1 ! int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1); // wxlCan canvas wxlCan * canvas = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); *************** *** 494,502 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { ! { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }, ! { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1; --- 600,615 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { ! { WXLUAMETHOD_METHOD, "MoveObject", s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlLuaCanCmd", s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1; + + WXLUADEFINE wxlLuaCanCmd_enums[] = { + { NULL, 0, }, + }; + + int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxlLuaCanCmd_enums[0]) - 1; + Index: wxluacan.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluacan.i 28 Aug 2006 05:26:19 -0000 1.9 --- wxluacan.i 31 May 2007 17:18:45 -0000 1.10 *************** *** 6,10 **** %class %noclassinfo wxlCanObj, wxObject ! wxlCanObj( double x = 0, double y = 0 ) void SetPos( double x, double y ) double GetX() --- 6,10 ---- %class %noclassinfo wxlCanObj, wxObject ! wxlCanObj( double x = 0, double y = 0 ) void SetPos( double x, double y ) double GetX() *************** *** 17,38 **** %class %noclassinfo wxlCanObjRect, wxlCanObj ! wxlCanObjRect( double x, double y, double w, double h ) %endclass %class %noclassinfo wxlCanObjCircle, wxlCanObj ! wxlCanObjCircle( double x, double y, double r ) %endclass %class %noclassinfo wxlCanObjScript, wxlCanObj ! wxlCanObjScript( double x, double y, const wxString& name ) %endclass %class %noclassinfo wxlCanObjAddScript, wxlCanObj ! wxlCanObjAddScript( double x, double y, const wxString& script ) void SetScript( const wxString& script ) %endclass %class %noclassinfo wxlCan, wxScrolledWindow ! wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) void AddObject( wxlCanObj *canobj ) bool GetYaxis() --- 17,38 ---- %class %noclassinfo wxlCanObjRect, wxlCanObj ! wxlCanObjRect( double x, double y, double w, double h ) %endclass %class %noclassinfo wxlCanObjCircle, wxlCanObj ! wxlCanObjCircle( double x, double y, double r ) %endclass %class %noclassinfo wxlCanObjScript, wxlCanObj ! wxlCanObjScript( double x, double y, const wxString& name ) %endclass %class %noclassinfo wxlCanObjAddScript, wxlCanObj ! wxlCanObjAddScript( double x, double y, const wxString& script ) void SetScript( const wxString& script ) %endclass %class %noclassinfo wxlCan, wxScrolledWindow ! wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) void AddObject( wxlCanObj *canobj ) bool GetYaxis() *************** *** 45,49 **** %class %noclassinfo wxlLuaCanCmd, wxCommandProcessor ! wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) void MoveObject( int index, double x, double y ) %endclass --- 45,49 ---- %class %noclassinfo wxlLuaCanCmd, wxCommandProcessor ! wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) void MoveObject( int index, double x, double y ) %endclass Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluacan_bind.cpp 19 Mar 2007 03:47:17 -0000 1.17 --- wxluacan_bind.cpp 31 May 2007 17:18:45 -0000 1.18 *************** *** 98,101 **** --- 98,103 ---- } + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, 0, 0, s_wxluaargArray_None }}; + // %function wxlLuaCanCmd* GetCmdhMain() static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) *************** *** 111,114 **** --- 113,118 ---- } + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None }}; + // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluacan() is called to register global functions *************** *** 119,126 **** static WXLUAMETHOD functionList[] = { ! { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, s_wxluaargArray_None }, ! { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None }, ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 123,130 ---- static WXLUAMETHOD functionList[] = { ! { WXLUAMETHOD_CFUNCTION, "GetCan", s_wxluafunc_wxLua_function_GetCan, 1 }, ! { WXLUAMETHOD_CFUNCTION, "GetCmdhMain", s_wxluafunc_wxLua_function_GetCmdhMain, 1 }, ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; *************** *** 138,148 **** static WXLUACLASS classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL }, { 0, 0, 0, 0, 0, 0, 0 }, --- 142,152 ---- static WXLUACLASS classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,wxlCan_enums, wxlCan_enumCount, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL ,wxlCanObj_enums, wxlCanObj_enumCount, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL ,wxlCanObjAddScript_enums, wxlCanObjAddScript_enumCount, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL ,wxlCanObjCircle_enums, wxlCanObjCircle_enumCount, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL ,wxlCanObjRect_enums, wxlCanObjRect_enumCount, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL ,wxlCanObjScript_enums, wxlCanObjScript_enumCount, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL ,wxlLuaCanCmd_enums, wxlLuaCanCmd_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxluacan.h 15 Mar 2007 23:24:49 -0000 1.22 --- wxluacan.h 31 May 2007 17:18:45 -0000 1.23 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 6 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 6 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 7 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 7 // --------------------------------------------------------------------------- *************** *** 60,81 **** --- 60,95 ---- extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCan_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObj_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjAddScript_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjCircle_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjRect_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjScript_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlLuaCanCmd_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount; |
