Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.28, 1.29 wxluacan.h, 1.25, 1.26 wxluacan_bind.cpp, 1.20, 1.21
|
From: John L. <jr...@us...> - 2007-06-07 03:42:41
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22306/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: Use dummy wxLuaBindDefine for class member enums if they don't have any Some formatting fixes for the generated bindings Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxluacan.cpp 6 Jun 2007 23:42:53 -0000 1.28 --- wxluacan.cpp 7 Jun 2007 03:21:58 -0000 1.29 *************** *** 30,34 **** static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_AddObject }}; - // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) --- 30,33 ---- *************** *** 48,52 **** static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetX }}; - // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) --- 47,50 ---- *************** *** 67,71 **** static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetY }}; - // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) --- 65,68 ---- *************** *** 88,92 **** static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }}; - // void SetBrush( const wxBrush& brush ) static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) --- 85,88 ---- *************** *** 106,110 **** static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPen }}; - // void SetPen( const wxPen& pen ) static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) --- 102,105 ---- *************** *** 126,130 **** static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPending }}; - // void SetPending( bool pending = true ) static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) --- 121,124 ---- *************** *** 146,150 **** static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxlCanObj_SetPos }}; - // void SetPos( double x, double y ) static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) --- 140,143 ---- *************** *** 166,170 **** static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }}; - // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) --- 159,162 ---- *************** *** 209,218 **** - wxLuaBindDefine wxlCanObj_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjRect --- 201,204 ---- *************** *** 225,229 **** static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_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) --- 211,214 ---- *************** *** 259,268 **** - wxLuaBindDefine wxlCanObjRect_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjCircle --- 244,247 ---- *************** *** 275,279 **** static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }}; - // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) --- 254,257 ---- *************** *** 307,316 **** - wxLuaBindDefine wxlCanObjCircle_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjScript --- 285,288 ---- *************** *** 323,327 **** static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_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) --- 295,298 ---- *************** *** 355,364 **** - wxLuaBindDefine wxlCanObjScript_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCanObjAddScript --- 326,329 ---- *************** *** 371,375 **** static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }}; - // void SetScript( const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) --- 336,339 ---- *************** *** 389,393 **** static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_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) --- 353,356 ---- *************** *** 422,431 **** - wxLuaBindDefine wxlCanObjAddScript_enums[] = { - { NULL, 0, }, - }; - - int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlCan --- 385,388 ---- *************** *** 438,442 **** static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCan_AddObject }}; - // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCan_AddObject(lua_State *L) --- 395,398 ---- *************** *** 456,460 **** static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetCmdh }}; - // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) --- 412,415 ---- *************** *** 475,479 **** static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetYaxis }}; - // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) --- 430,433 ---- *************** *** 496,500 **** static int LUACALL wxLua_wxlCan_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_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) --- 450,453 ---- *************** *** 541,550 **** - wxLuaBindDefine wxlCan_enums[] = { - { NULL, 0, }, - }; - - int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxLuaBindDefine) - 1; - // --------------------------------------------------------------------------- // Bind class wxlLuaCanCmd --- 494,497 ---- *************** *** 557,561 **** static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }}; - // void MoveObject( int index, double x, double y ) static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) --- 504,507 ---- *************** *** 579,583 **** static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }}; - // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) --- 525,528 ---- *************** *** 612,619 **** - wxLuaBindDefine wxlLuaCanCmd_enums[] = { - { NULL, 0, }, - }; - - int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxLuaBindDefine) - 1; - --- 557,558 ---- Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluacan_bind.cpp 6 Jun 2007 23:42:53 -0000 1.20 --- wxluacan_bind.cpp 7 Jun 2007 03:21:58 -0000 1.21 *************** *** 97,101 **** return 1; } - static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; --- 97,100 ---- *************** *** 112,116 **** return 1; } - static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; --- 111,114 ---- *************** *** 142,152 **** static wxLuaBindClass 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 }, --- 140,150 ---- static wxLuaBindClass classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL ,s_wxluadefineArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluacan.h 6 Jun 2007 23:42:53 -0000 1.25 --- wxluacan.h 7 Jun 2007 03:21:58 -0000 1.26 *************** *** 60,95 **** extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCan_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObj_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjAddScript_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjCircle_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjRect_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlCanObjScript_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; - extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlLuaCanCmd_enums[]; - extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount; --- 60,81 ---- |
