Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.64, 1.65 gdi.cpp, 1.82, 1.83 windows.cpp, 1.71, 1.72
|
From: John L. <jr...@us...> - 2007-07-02 00:05:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/modules/wxbind/src Modified Files: appframe.cpp gdi.cpp windows.cpp Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** windows.cpp 30 Jun 2007 00:12:25 -0000 1.71 --- windows.cpp 2 Jul 2007 00:05:14 -0000 1.72 *************** *** 2855,2863 **** #endif // wxLUA_USE_wxPointSizeRect ! #if (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxAcceleratorTable, NULL }; static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable[1] = {{ wxLua_wxWindow_SetAcceleratorTable, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable }}; ! // wxLUA_USE_wxAcceleratorTable virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L) { --- 2855,2863 ---- #endif // wxLUA_USE_wxPointSizeRect ! #if wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxAcceleratorTable, NULL }; static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable[1] = {{ wxLua_wxWindow_SetAcceleratorTable, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable }}; ! // virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L) { *************** *** 2873,2877 **** } ! #endif // (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAutoLayout[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; --- 2873,2877 ---- } ! #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAutoLayout[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; *************** *** 2931,2939 **** ! #if wxLUA_USE_wxPointSizeRect static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetBestFittingSize[1] = {{ wxLua_wxWindow_SetBestFittingSize, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize }}; ! // void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L) { --- 2931,2939 ---- ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetBestFittingSize[1] = {{ wxLua_wxWindow_SetBestFittingSize, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize }}; ! // !%wxchkver_2_8 void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L) { *************** *** 2951,2955 **** } ! #endif // wxLUA_USE_wxPointSizeRect #if wxLUA_USE_wxCaret && wxUSE_CARET --- 2951,2955 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) #if wxLUA_USE_wxCaret && wxUSE_CARET *************** *** 3240,3243 **** --- 3240,3266 ---- } + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetInitialSize[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSize, NULL }; + static int LUACALL wxLua_wxWindow_SetInitialSize(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetInitialSize[1] = {{ wxLua_wxWindow_SetInitialSize, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxWindow_SetInitialSize }}; + // %wxchkver_2_8 void SetInitialSize(const wxSize& size = wxDefaultSize) + static int LUACALL wxLua_wxWindow_SetInitialSize(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 2 ? (const wxSize *)wxlState.GetUserDataType(2, s_wxluatag_wxSize) : &wxDefaultSize); + // get this + wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call SetInitialSize + self->SetInitialSize(*size); + + return 0; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetLabel[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxWindow_SetLabel(lua_State *L); *************** *** 4668,4674 **** #endif // wxLUA_USE_wxPointSizeRect ! #if (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) { "SetAcceleratorTable", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable, 1, NULL }, ! #endif // (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) { "SetAutoLayout", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAutoLayout, 1, NULL }, --- 4691,4697 ---- #endif // wxLUA_USE_wxPointSizeRect ! #if wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL { "SetAcceleratorTable", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable, 1, NULL }, ! #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL { "SetAutoLayout", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAutoLayout, 1, NULL }, *************** *** 4680,4686 **** { "SetBackgroundStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBackgroundStyle, 1, NULL }, ! #if wxLUA_USE_wxPointSizeRect { "SetBestFittingSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBestFittingSize, 1, NULL }, ! #endif // wxLUA_USE_wxPointSizeRect #if wxLUA_USE_wxCaret && wxUSE_CARET --- 4703,4709 ---- { "SetBackgroundStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBackgroundStyle, 1, NULL }, ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) { "SetBestFittingSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBestFittingSize, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) #if wxLUA_USE_wxCaret && wxUSE_CARET *************** *** 4726,4729 **** --- 4749,4757 ---- { "SetHelpText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetHelpText, 1, NULL }, { "SetId", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetId, 1, NULL }, + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + { "SetInitialSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetInitialSize, 1, NULL }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + { "SetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetLabel, 1, NULL }, Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** gdi.cpp 30 Jun 2007 00:12:23 -0000 1.82 --- gdi.cpp 2 Jul 2007 00:05:13 -0000 1.83 *************** *** 14213,14220 **** #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor2[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLCanvas, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor2[1] = {{ wxLua_wxGLCanvas_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor2 }}; ! // wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L) { --- 14213,14257 ---- #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor3[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_Table, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, NULL }; ! static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor3[1] = {{ wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor3 }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) ! static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxGLCanvas *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // const wxPalette palette = wxNullPalette ! const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("GLCanvas"))); ! // long style = 0 ! long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); ! // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // int attribList = 0 ! int count = 0; wxLuaSmartIntArray attribList = (argCount >= 3 ? wxlState.GetIntArray(3, count) : 0); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : wxID_ANY); ! // wxWindow parent ! wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); ! // call constructor ! returns = new wxGLCanvas(parent, id, attribList, *pos, *size, style, name, *palette); ! // add to tracked window list, it will check validity ! wxlState.AddTrackedWindow(returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxGLCanvas, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor2[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLCanvas, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor2[1] = {{ wxLua_wxGLCanvas_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor2 }}; ! // wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L) { *************** *** 14228,14233 **** // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "wxGLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxGLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); --- 14265,14270 ---- // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("GLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); *************** *** 14236,14241 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxGLCanvas sharedCanvas wxGLCanvas * sharedCanvas = (wxGLCanvas *)wxlState.GetUserDataType(2, s_wxluatag_wxGLCanvas); --- 14273,14278 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : -1); // wxGLCanvas sharedCanvas wxGLCanvas * sharedCanvas = (wxGLCanvas *)wxlState.GetUserDataType(2, s_wxluatag_wxGLCanvas); *************** *** 14252,14259 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLContext, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor1[1] = {{ wxLua_wxGLCanvas_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor1 }}; ! // wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L) { --- 14289,14296 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLContext, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor1[1] = {{ wxLua_wxGLCanvas_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor1 }}; ! // wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L) { *************** *** 14267,14272 **** // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "wxGLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxGLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); --- 14304,14309 ---- // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("GLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); *************** *** 14275,14280 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxGLContext sharedContext wxGLContext * sharedContext = (wxGLContext *)wxlState.GetUserDataType(2, s_wxluatag_wxGLContext); --- 14312,14317 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : -1); // wxGLContext sharedContext wxGLContext * sharedContext = (wxGLContext *)wxlState.GetUserDataType(2, s_wxluatag_wxGLContext); *************** *** 14293,14298 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor[1] = {{ wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L) { --- 14330,14335 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor[1] = {{ wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L) { *************** *** 14304,14311 **** // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); ! // LuaTable intTable ! YOU MUST OVERRIDE THIS FUNCTION intTable = YOU MUST OVERRIDE THIS FUNCTION ; ! // const wxString name = "wxGLCanvas" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxGLCanvas"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : 0); --- 14341,14348 ---- // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); ! // int attribList = 0 ! int count = 0; wxLuaSmartIntArray attribList = (argCount >= 7 ? wxlState.GetIntArray(7, count) : 0); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("GLCanvas"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : 0); *************** *** 14319,14323 **** wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, id, *pos, *size, style, name, intTable, *palette); // add to tracked window list, it will check validity wxlState.AddTrackedWindow(returns); --- 14356,14360 ---- wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxlState.AddTrackedWindow(returns); *************** *** 14360,14364 **** static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! { wxLua_wxGLCanvas_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 2, 9, s_wxluaargArray_None }, #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) --- 14397,14405 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! { wxLua_wxGLCanvas_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 9, s_wxluaargArray_None }, ! ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor3 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) *************** *** 14371,14375 **** #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) }; --- 14412,14416 ---- #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) }; Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** appframe.cpp 30 Jun 2007 18:18:45 -0000 1.64 --- appframe.cpp 2 Jul 2007 00:05:13 -0000 1.65 *************** *** 2249,2253 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_SetStatusWidths[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxFrame_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFrame_SetStatusWidths[1] = {{ wxLua_wxFrame_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFrame_SetStatusWidths }}; --- 2249,2253 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_SetStatusWidths[] = { &s_wxluatag_wxFrame, &s_wxluaarg_Table, NULL }; static int LUACALL wxLua_wxFrame_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFrame_SetStatusWidths[1] = {{ wxLua_wxFrame_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFrame_SetStatusWidths }}; *************** *** 2763,2767 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles[] = { &s_wxluatag_wxStatusBar, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusStyles(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusStyles[1] = {{ wxLua_wxStatusBar_SetStatusStyles, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles }}; --- 2763,2767 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_Table, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusStyles(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusStyles[1] = {{ wxLua_wxStatusBar_SetStatusStyles, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles }}; *************** *** 2801,2805 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths[] = { &s_wxluatag_wxStatusBar, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusWidths[1] = {{ wxLua_wxStatusBar_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths }}; --- 2801,2805 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_Table, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusWidths[1] = {{ wxLua_wxStatusBar_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths }}; |
