Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxadv_adv.cpp, 1.11, 1.12 wxcore_controls.cpp, 1.10, 1.11 wxcore_windows.cpp, 1.11, 1.12 wxgl_gl.cpp, 1.7, 1.8
|
From: John L. <jr...@us...> - 2008-01-17 22:37:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11473/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxcore_controls.cpp wxcore_windows.cpp wxgl_gl.cpp Log Message: Fix bindings with args missing default values and check for that in the generator. Index: wxcore_windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_windows.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxcore_windows.cpp 22 Dec 2007 06:07:14 -0000 1.11 --- wxcore_windows.cpp 17 Jan 2008 22:37:29 -0000 1.12 *************** *** 8940,8945 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxStaticBitmap_Create[] = { &g_wxluatype_wxStaticBitmap, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxBitmap, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStaticBitmap_Create[1] = {{ wxLua_wxStaticBitmap_Create, WXLUAMETHOD_METHOD, 4, 8, s_wxluatypeArray_wxLua_wxStaticBitmap_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L) { --- 8940,8945 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxStaticBitmap_Create[] = { &g_wxluatype_wxStaticBitmap, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxBitmap, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStaticBitmap_Create[1] = {{ wxLua_wxStaticBitmap_Create, WXLUAMETHOD_METHOD, 3, 8, s_wxluatypeArray_wxLua_wxStaticBitmap_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L) { *************** *** 8952,8957 **** // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); ! // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxPoint); // const wxBitmap label = wxNullBitmap const wxBitmap * label = (argCount >= 4 ? (const wxBitmap *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxBitmap) : &wxNullBitmap); --- 8952,8957 ---- // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); ! // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxPoint) : &wxDefaultPosition); // const wxBitmap label = wxNullBitmap const wxBitmap * label = (argCount >= 4 ? (const wxBitmap *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxBitmap) : &wxNullBitmap); Index: wxgl_gl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_gl.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxgl_gl.cpp 9 Jan 2008 05:02:53 -0000 1.7 --- wxgl_gl.cpp 17 Jan 2008 22:37:29 -0000 1.8 *************** *** 439,450 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor2[] = { &g_wxluatype_TBOOLEAN, &g_wxluatype_wxGLCanvas, &g_wxluatype_wxPalette, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor2[1] = {{ wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 3, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }}; ! // wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other) static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L) { // get number of arguments int argCount = lua_gettop(L); ! // const wxGLContext other ! const wxGLContext * other = (const wxGLContext *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxGLContext); // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 3 ? (const wxPalette *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPalette) : &wxNullPalette); --- 439,450 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor2[] = { &g_wxluatype_TBOOLEAN, &g_wxluatype_wxGLCanvas, &g_wxluatype_wxPalette, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor2[1] = {{ wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }}; ! // wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other = NULL) static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L) { // get number of arguments int argCount = lua_gettop(L); ! // const wxGLContext other = NULL ! const wxGLContext * other = (argCount >= 4 ? (const wxGLContext *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxGLContext) : NULL); // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 3 ? (const wxPalette *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPalette) : &wxNullPalette); *************** *** 543,547 **** #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! { wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 3, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) --- 543,547 ---- #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! { wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) Index: wxadv_adv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_adv.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxadv_adv.cpp 8 Jan 2008 00:55:35 -0000 1.11 --- wxadv_adv.cpp 17 Jan 2008 22:37:29 -0000 1.12 *************** *** 1467,1472 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Create[] = { &g_wxluatype_wxBitmapComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Create[1] = {{ wxLua_wxBitmapComboBox_Create, WXLUAMETHOD_METHOD, 5, 10, s_wxluatypeArray_wxLua_wxBitmapComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L) { --- 1467,1472 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Create[] = { &g_wxluatype_wxBitmapComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Create[1] = {{ wxLua_wxBitmapComboBox_Create, WXLUAMETHOD_METHOD, 4, 10, s_wxluatypeArray_wxLua_wxBitmapComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L) { *************** *** 1479,1484 **** // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 7); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); --- 1479,1484 ---- // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 7 ? wxlua_getwxArrayString(L, 7) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1640,1645 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_constructor1[1] = {{ wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }}; ! // wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L) { --- 1640,1645 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_constructor1[1] = {{ wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }}; ! // wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L) { *************** *** 1652,1657 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 1652,1657 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1739,1743 **** #if (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }, #endif // (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxBitmapComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 1739,1743 ---- #if (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }, #endif // (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxBitmapComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, Index: wxcore_controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_controls.cpp 22 Dec 2007 06:07:12 -0000 1.10 --- wxcore_controls.cpp 17 Jan 2008 22:37:29 -0000 1.11 *************** *** 1483,1488 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_Create[] = { &g_wxluatype_wxChoice, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_Create[1] = {{ wxLua_wxChoice_Create, WXLUAMETHOD_METHOD, 4, 9, s_wxluatypeArray_wxLua_wxChoice_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { --- 1483,1488 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_Create[] = { &g_wxluatype_wxChoice, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_Create[1] = {{ wxLua_wxChoice_Create, WXLUAMETHOD_METHOD, 3, 9, s_wxluatypeArray_wxLua_wxChoice_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { *************** *** 1495,1500 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 1495,1500 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1537,1542 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_constructor1[1] = {{ wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }}; ! // wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_constructor1(lua_State *L) { --- 1537,1542 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_constructor1[1] = {{ wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }}; ! // wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_constructor1(lua_State *L) { *************** *** 1549,1554 **** // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 5); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); --- 1549,1554 ---- // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 5 ? wxlua_getwxArrayString(L, 5) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1595,1599 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxChoice_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 1595,1599 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxChoice_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 1729,1734 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_Create[] = { &g_wxluatype_wxComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_Create[1] = {{ wxLua_wxComboBox_Create, WXLUAMETHOD_METHOD, 4, 10, s_wxluatypeArray_wxLua_wxComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_Create(lua_State *L) { --- 1729,1734 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_Create[] = { &g_wxluatype_wxComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_Create[1] = {{ wxLua_wxComboBox_Create, WXLUAMETHOD_METHOD, 3, 10, s_wxluatypeArray_wxLua_wxComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_Create(lua_State *L) { *************** *** 1741,1746 **** // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 7); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); --- 1741,1746 ---- // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 7 ? wxlua_getwxArrayString(L, 7) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1995,2000 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_constructor1[1] = {{ wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }}; ! // wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L) { --- 1995,2000 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_constructor1[1] = {{ wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }}; ! // wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L) { *************** *** 2007,2012 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 2007,2012 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2055,2059 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) ! { wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) { wxLua_wxComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 2055,2059 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) ! { wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) { wxLua_wxComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 2428,2433 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_Create[] = { &g_wxluatype_wxListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_Create[1] = {{ wxLua_wxListBox_Create, WXLUAMETHOD_METHOD, 4, 9, s_wxluatypeArray_wxLua_wxListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_Create(lua_State *L) { --- 2428,2433 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_Create[] = { &g_wxluatype_wxListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_Create[1] = {{ wxLua_wxListBox_Create, WXLUAMETHOD_METHOD, 3, 9, s_wxluatypeArray_wxLua_wxListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_Create(lua_State *L) { *************** *** 2440,2445 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 2440,2445 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2641,2646 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_constructor1[1] = {{ wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }}; ! // wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_constructor1(lua_State *L) { --- 2641,2646 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_constructor1[1] = {{ wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }}; ! // wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_constructor1(lua_State *L) { *************** *** 2653,2658 **** // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 5); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); --- 2653,2658 ---- // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 5 ? wxlua_getwxArrayString(L, 5) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2699,2703 **** #if (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }, #endif // (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 2699,2703 ---- #if (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }, #endif // (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 2778,2783 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_Create[] = { &g_wxluatype_wxCheckListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_Create[1] = {{ wxLua_wxCheckListBox_Create, WXLUAMETHOD_METHOD, 4, 9, s_wxluatypeArray_wxLua_wxCheckListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L) { --- 2778,2783 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_Create[] = { &g_wxluatype_wxCheckListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_Create[1] = {{ wxLua_wxCheckListBox_Create, WXLUAMETHOD_METHOD, 3, 9, s_wxluatypeArray_wxLua_wxCheckListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L) { *************** *** 2790,2795 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 2790,2795 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2834,2839 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_constructor1[1] = {{ wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }}; ! // wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L) { --- 2834,2839 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_constructor1[1] = {{ wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }}; ! // wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L) { *************** *** 2846,2851 **** // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 5); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); --- 2846,2851 ---- // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 5 ? wxlua_getwxArrayString(L, 5) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2892,2896 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCheckListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 2892,2896 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCheckListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 5841,5846 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_Create[] = { &g_wxluatype_wxRadioBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_Create[1] = {{ wxLua_wxRadioBox_Create, WXLUAMETHOD_METHOD, 5, 11, s_wxluatypeArray_wxLua_wxRadioBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_Create(lua_State *L) { --- 5841,5846 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_Create[] = { &g_wxluatype_wxRadioBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_Create[1] = {{ wxLua_wxRadioBox_Create, WXLUAMETHOD_METHOD, 4, 11, s_wxluatypeArray_wxLua_wxRadioBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_Create(lua_State *L) { *************** *** 5855,5860 **** // int majorDimension = 0 int majorDimension = (argCount >= 8 ? (int)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 7); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); --- 5855,5860 ---- // int majorDimension = 0 int majorDimension = (argCount >= 8 ? (int)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 7 ? wxlua_getwxArrayString(L, 7) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 6071,6076 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_constructor1[1] = {{ wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }}; ! // wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L) { --- 6071,6076 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_constructor1[1] = {{ wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }}; ! // wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L) { *************** *** 6085,6090 **** // int majorDimension = 0 int majorDimension = (argCount >= 7 ? (int)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 6085,6090 ---- // int majorDimension = 0 int majorDimension = (argCount >= 7 ? (int)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 6144,6148 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxRadioBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 6144,6148 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxRadioBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, |
