Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp,1.16,1.17 controls.cpp,1.24,1.25 data.cpp,1.19,1.20 dialogs.cpp,1.15,1.16 grid.cpp,1.14,1.15 wx_bind.cpp,1.40,1.41
|
From: John L. <jr...@us...> - 2006-05-17 22:47:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27493/wxLua/modules/wxbind/src Modified Files: appframe.cpp controls.cpp data.cpp dialogs.cpp grid.cpp wx_bind.cpp Log Message: change enum wxClass::XXX to be accessed as wxClass_XXX added %staticonly keyword for classes that only have static members Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** controls.cpp 16 May 2006 04:55:33 -0000 1.24 --- controls.cpp 17 May 2006 22:47:10 -0000 1.25 *************** *** 1232,1236 **** long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); --- 1232,1236 ---- long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1266,1270 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 1266,1270 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1315,1320 **** #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxChoice) ! { LuaConstructor, "wxChoice", wxLua_wxChoice_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxChoice_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 1315,1320 ---- #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxChoice) ! { LuaConstructor, "wxChoice", wxLua_wxChoice_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxChoice_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 1353,1357 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 1353,1357 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1389,1393 **** long style = (argCount >= 8 ? (long)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); --- 1389,1393 ---- long style = (argCount >= 8 ? (long)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1695,1700 **** #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox) ! { LuaConstructor, "wxComboBox", wxLua_wxComboBox_constructor, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxComboBox_Create, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 1695,1700 ---- #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox) ! { LuaConstructor, "wxComboBox", wxLua_wxComboBox_constructor, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxComboBox_Create, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 2008,2012 **** long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); --- 2008,2012 ---- long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2042,2046 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 2042,2046 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2108,2112 **** int pos = (int)wxlState.GetNumberType(3); // const wxArrayString_FromLuaTable items ! int dummy_count; wxArrayString items = wxArrayString(); dummy_count = wxlState.GetwxArrayString(2, items); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); --- 2108,2112 ---- int pos = (int)wxlState.GetNumberType(3); // const wxArrayString_FromLuaTable items ! wxArrayString items = wxArrayString(); wxlState.GetwxArrayString(2, items); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); *************** *** 2139,2143 **** wxLuaState wxlState(L); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(2, choices); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); --- 2139,2143 ---- wxLuaState wxlState(L); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(2, choices); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); *************** *** 2211,2216 **** #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxListBox)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxListBox", wxLua_wxListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 2211,2216 ---- #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxListBox)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxListBox", wxLua_wxListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 2221,2227 **** { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Set", wxLua_wxListBox_Set, 1, 1, { 0 } }, { LuaMethod, "SetFirstItem", wxLua_wxListBox_SetFirstItem, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetSelection", wxLua_wxListBox_SetSelection, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, --- 2221,2227 ---- { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_LuaTable, &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Set", wxLua_wxListBox_Set, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaMethod, "SetFirstItem", wxLua_wxListBox_SetFirstItem, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetSelection", wxLua_wxListBox_SetSelection, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, *************** *** 2260,2264 **** long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); --- 2260,2264 ---- long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2294,2298 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 2294,2298 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2363,2368 **** #if ((wxLUA_USE_wxValidator) && ((wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox))) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxCheckListBox", wxLua_wxCheckListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxCheckListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 2363,2368 ---- #if ((wxLUA_USE_wxValidator) && ((wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox))) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxCheckListBox", wxLua_wxCheckListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxCheckListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 5043,5047 **** int majorDimension = (argCount >= 7 ? (int)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 5043,5047 ---- int majorDimension = (argCount >= 7 ? (int)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 5081,5085 **** int majorDimension = (argCount >= 8 ? (int)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); --- 5081,5085 ---- int majorDimension = (argCount >= 8 ? (int)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 5310,5315 **** #if ((wxLUA_USE_wxRadioBox) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxRadioBox", wxLua_wxRadioBox_constructor, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxRadioBox_Create, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 5310,5315 ---- #if ((wxLUA_USE_wxRadioBox) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxRadioBox", wxLua_wxRadioBox_constructor, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxRadioBox_Create, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** grid.cpp 16 May 2006 22:47:09 -0000 1.14 --- grid.cpp 17 May 2006 22:47:10 -0000 1.15 *************** *** 1050,1054 **** bool allowOthers = (argCount >= 2 ? wxlState.GetBooleanType(2) : false); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(1, choices); // call constructor returns = new wxGridCellChoiceEditor(choices, allowOthers); --- 1050,1054 ---- bool allowOthers = (argCount >= 2 ? wxlState.GetBooleanType(2) : false); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(1, choices); // call constructor returns = new wxGridCellChoiceEditor(choices, allowOthers); *************** *** 1070,1074 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxGridCellChoiceEditor_methods[] = { ! { LuaConstructor, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_constructor, 2, 1, { &s_wxluaarg_Boolean, 0 } }, { LuaDelete, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_destructor, 0, 0, {0} }, }; --- 1070,1074 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxGridCellChoiceEditor_methods[] = { ! { LuaConstructor, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_constructor, 2, 1, { &s_wxluaarg_LuaTable, &s_wxluaarg_Boolean, 0 } }, { LuaDelete, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_destructor, 0, 0, {0} }, }; Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** appframe.cpp 2 May 2006 05:25:01 -0000 1.16 --- appframe.cpp 17 May 2006 22:47:10 -0000 1.17 *************** *** 67,107 **** - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxLUA_USE_wxApp) - // %wxchkver22&!%wxchkver24&(%win|%mac) void SetAuto3D(const bool auto3D) - static int LUACALL wxLua_wxApp_SetAuto3D(lua_State *L) - { - wxLuaState wxlState(L); - // const bool auto3D - const bool auto3D = wxlState.GetBooleanType(2); - // get this - wxApp * self = (wxApp *)wxlState.GetUserDataType(1, s_wxluatag_wxApp); - // call SetAuto3D - self->SetAuto3D(auto3D); - - return 0; - } - - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxApp) - // %wxchkver22&!%wxchkver25&%win bool GetAuto3D() const - static int LUACALL wxLua_wxApp_GetAuto3D(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get this - wxApp * self = (wxApp *)wxlState.GetUserDataType(1, s_wxluatag_wxApp); - // call GetAuto3D - returns = self->GetAuto3D(); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - - #endif - - #if (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxApp) // %wxchkver25 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) --- 67,70 ---- *************** *** 381,396 **** static WXLUAMETHOD s_wxApp_methods[] = { - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxLUA_USE_wxApp) - { LuaMethod, "SetAuto3D", wxLua_wxApp_SetAuto3D, 1, 1, { &s_wxluaarg_Boolean, 0 } }, - { LuaGetProp, "Auto3D", wxLua_wxApp_GetAuto3D, 0, 0, {0} }, - { LuaSetProp, "Auto3D", wxLua_wxApp_SetAuto3D, 1, 1, {0} }, - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxApp) - { LuaMethod, "GetAuto3D", wxLua_wxApp_GetAuto3D, 0, 0, { 0 } }, - #endif - - #if (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxApp) { LuaMethod, "SendIdleEvents", wxLua_wxApp_SendIdleEvents, 2, 2, { &s_wxluatag_wxWindow, &s_wxluatag_wxIdleEvent, 0 } }, --- 344,347 ---- *************** *** 714,735 **** - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) - // %wxchkver22&!%wxchkver24 void Command(int id) - static int LUACALL wxLua_wxFrame_Command(lua_State *L) - { - wxLuaState wxlState(L); - // int id - int id = (int)wxlState.GetNumberType(2); - // get this - wxFrame * self = (wxFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxFrame); - // call Command - self->Command(id); - - return 0; - } - - #endif - - #if (wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) // %wxchkver24 void ProcessCommand(int id) --- 665,668 ---- *************** *** 1098,1106 **** static WXLUAMETHOD s_wxFrame_methods[] = { - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) - { LuaMethod, "Command", wxLua_wxFrame_Command, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - #if (wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) { LuaMethod, "ProcessCommand", wxLua_wxFrame_ProcessCommand, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 1031,1034 ---- *************** *** 1146,1150 **** { LuaMethod, "SetStatusBarPane", wxLua_wxFrame_SetStatusBarPane, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxFrame_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxFrame_SetStatusWidths, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, { LuaDelete, "wxFrame", wxLua_wxFrame_destructor, 0, 0, {0} }, }; --- 1074,1078 ---- { LuaMethod, "SetStatusBarPane", wxLua_wxFrame_SetStatusBarPane, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxFrame_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxFrame_SetStatusWidths, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaDelete, "wxFrame", wxLua_wxFrame_destructor, 0, 0, {0} }, }; *************** *** 1589,1594 **** { LuaMethod, "SetMinHeight", wxLua_wxStatusBar_SetMinHeight, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxStatusBar_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxStatusBar_SetStatusWidths, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "SetStatusStyles", wxLua_wxStatusBar_SetStatusStyles, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, { LuaGetProp, "FieldsCount", wxLua_wxStatusBar_GetFieldsCount, 0, 0, {0} }, { LuaDelete, "wxStatusBar", wxLua_wxStatusBar_destructor, 0, 0, {0} }, --- 1517,1522 ---- { LuaMethod, "SetMinHeight", wxLua_wxStatusBar_SetMinHeight, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxStatusBar_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxStatusBar_SetStatusWidths, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, ! { LuaMethod, "SetStatusStyles", wxLua_wxStatusBar_SetStatusStyles, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaGetProp, "FieldsCount", wxLua_wxStatusBar_GetFieldsCount, 0, 0, {0} }, { LuaDelete, "wxStatusBar", wxLua_wxStatusBar_destructor, 0, 0, {0} }, *************** *** 1823,1826 **** --- 1751,1771 ---- } + // %constructor wxAcceleratorTableCopy(const wxAcceleratorTable& accel) + static int LUACALL wxLua_wxAcceleratorTableCopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxAcceleratorTable *returns; + // const wxAcceleratorTable accel + const wxAcceleratorTable * accel = (const wxAcceleratorTable *)wxlState.GetUserDataType(1, s_wxluatag_wxAcceleratorTable); + // call constructor + returns = new wxAcceleratorTable(*accel); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxAcceleratorTable *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxAcceleratorTable, returns); + + return 1; + } + // bool Ok() const static int LUACALL wxLua_wxAcceleratorTable_Ok(lua_State *L) *************** *** 1869,1873 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxAcceleratorTable_methods[] = { ! { LuaConstructor, "wxAcceleratorTable", wxLua_wxAcceleratorTable_constructor, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxAcceleratorEntry, 0 } }, { LuaMethod, "Ok", wxLua_wxAcceleratorTable_Ok, 0, 0, { 0 } }, { LuaDelete, "wxAcceleratorTable", wxLua_wxAcceleratorTable_destructor, 0, 0, {0} }, --- 1814,1819 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxAcceleratorTable_methods[] = { ! { LuaConstructor, "wxAcceleratorTable", wxLua_wxAcceleratorTable_constructor, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, ! { LuaConstructor, "wxAcceleratorTableCopy", wxLua_wxAcceleratorTableCopy_constructor, 1, 1, { &s_wxluatag_wxAcceleratorTable, 0 } }, { LuaMethod, "Ok", wxLua_wxAcceleratorTable_Ok, 0, 0, { 0 } }, { LuaDelete, "wxAcceleratorTable", wxLua_wxAcceleratorTable_destructor, 0, 0, {0} }, *************** *** 1912,1915 **** --- 1858,1878 ---- } + // %constructor wxAcceleratorEntryCopy(const wxAcceleratorEntry& entry) + static int LUACALL wxLua_wxAcceleratorEntryCopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxAcceleratorEntry *returns; + // const wxAcceleratorEntry entry + const wxAcceleratorEntry * entry = (const wxAcceleratorEntry *)wxlState.GetUserDataType(1, s_wxluatag_wxAcceleratorEntry); + // call constructor + returns = new wxAcceleratorEntry(*entry); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxAcceleratorEntry *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxAcceleratorEntry, returns); + + return 1; + } + // int GetCommand() const static int LUACALL wxLua_wxAcceleratorEntry_GetCommand(lua_State *L) *************** *** 2007,2010 **** --- 1970,1974 ---- static WXLUAMETHOD s_wxAcceleratorEntry_methods[] = { { LuaConstructor, "wxAcceleratorEntry", wxLua_wxAcceleratorEntry_constructor, 3, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaConstructor, "wxAcceleratorEntryCopy", wxLua_wxAcceleratorEntryCopy_constructor, 1, 1, { &s_wxluatag_wxAcceleratorEntry, 0 } }, { LuaMethod, "GetCommand", wxLua_wxAcceleratorEntry_GetCommand, 0, 0, { 0 } }, { LuaMethod, "GetFlags", wxLua_wxAcceleratorEntry_GetFlags, 0, 0, { 0 } }, *************** *** 2189,2335 **** int s_wxluatag_wxSystemSettings = -1; - - #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxSystemSettings) - // %wxchkver23 %static wxFont GetFont(wxSystemFont index) - static int LUACALL wxLua_wxSystemSettings_GetFont(lua_State *L) - { - wxLuaState wxlState(L); - wxFont *returns; - // wxSystemFont index - wxSystemFont index = (wxSystemFont)wxlState.GetEnumerationType(2); - // call GetFont - // allocate a new object using the copy constructor - returns = new wxFont(wxSystemSettings::GetFont(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxFont, returns); - - return 1; - } - - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxColourPenBrush) - // %wxchkver22&!%wxchkver23 static wxColour GetSystemColour(int index) - static int LUACALL wxLua_wxSystemSettings_GetSystemColour(lua_State *L) - { - wxLuaState wxlState(L); - wxColour *returns; - // int index - int index = (int)wxlState.GetNumberType(2); - // call GetSystemColour - // allocate a new object using the copy constructor - returns = new wxColour(wxSystemSettings::GetSystemColour(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxColour, returns); - - return 1; - } - - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont) - // %wxchkver22&!%wxchkver23 static wxFont GetSystemFont(int index) - static int LUACALL wxLua_wxSystemSettings_GetSystemFont(lua_State *L) - { - wxLuaState wxlState(L); - wxFont *returns; - // int index - int index = (int)wxlState.GetNumberType(2); - // call GetSystemFont - // allocate a new object using the copy constructor - returns = new wxFont(wxSystemSettings::GetSystemFont(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxFont, returns); - - return 1; - } - - #endif - - - #if ((wxLUA_USE_wxColourPenBrush) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings))) && (wxLUA_USE_wxSystemSettings) - // %wxchkver23 %static wxColour GetColour(wxSystemColour index) - static int LUACALL wxLua_wxSystemSettings_GetColour(lua_State *L) - { - wxLuaState wxlState(L); - wxColour *returns; - // wxSystemColour index - wxSystemColour index = (wxSystemColour)wxlState.GetEnumerationType(2); - // call GetColour - // allocate a new object using the copy constructor - returns = new wxColour(wxSystemSettings::GetColour(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxColour, returns); - - return 1; - } - - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings) - // %wxchkver22&!%wxchkver23 static int GetSystemMetric(int index) - static int LUACALL wxLua_wxSystemSettings_GetSystemMetric(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // int index - int index = (int)wxlState.GetNumberType(2); - // call GetSystemMetric - returns = wxSystemSettings::GetSystemMetric(index); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - - #endif - - - #if (wxLUA_USE_wxSystemSettings) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) - // %wxchkver23 %static int GetMetric(wxSystemMetric index, wxWindow* win = NULL) - static int LUACALL wxLua_wxSystemSettings_GetMetric(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get number of arguments - int argCount = lua_gettop(L); - // wxWindow win = NULL - wxWindow * win = (argCount >= 3 ? (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow) : NULL); - // wxSystemMetric index - wxSystemMetric index = (wxSystemMetric)wxlState.GetEnumerationType(2); - // call GetMetric - returns = wxSystemSettings::GetMetric(index, win); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - - #endif - - // wxSystemSettings() // all members static - static int LUACALL wxLua_wxSystemSettings_constructor(lua_State *L) - { - wxLuaState wxlState(L); - wxSystemSettings *returns; - // call constructor - returns = new wxSystemSettings(); - // push the constructed class pointer - wxlState.PushUserDataType(s_wxluatag_wxSystemSettings, returns); - - return 1; - } - static int LUACALL wxLua_wxSystemSettings_destructor(lua_State *) { --- 2153,2156 ---- *************** *** 2343,2377 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxSystemSettings_methods[] = { - - #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxSystemSettings) - { LuaMethod, "GetFont", wxLua_wxSystemSettings_GetFont, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxColourPenBrush) - { LuaMethod, "GetSystemColour", wxLua_wxSystemSettings_GetSystemColour, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont) - { LuaMethod, "GetSystemFont", wxLua_wxSystemSettings_GetSystemFont, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - - #if ((wxLUA_USE_wxColourPenBrush) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings))) && (wxLUA_USE_wxSystemSettings) - { LuaMethod, "GetColour", wxLua_wxSystemSettings_GetColour, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings) - { LuaMethod, "GetSystemMetric", wxLua_wxSystemSettings_GetSystemMetric, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - - #if (wxLUA_USE_wxSystemSettings) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) - { LuaMethod, "GetMetric", wxLua_wxSystemSettings_GetMetric, 2, 1, { &s_wxluaarg_Enumeration, &s_wxluatag_wxWindow, 0 } }, - #endif - - { LuaConstructor, "wxSystemSettings", wxLua_wxSystemSettings_constructor, 0, 0, { 0 } }, { LuaDelete, "wxSystemSettings", wxLua_wxSystemSettings_destructor, 0, 0, {0} }, }; --- 2164,2167 ---- *************** *** 2391,2504 **** int s_wxluatag_wxSystemOptions = -1; ! // static wxString GetOption(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_GetOption(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxString returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call GetOption ! returns = wxSystemOptions::GetOption(name); ! // push the result string ! lua_pushstring(L, wx2lua(returns) ); ! ! return 1; ! } ! ! // static int GetOptionInt(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_GetOptionInt(lua_State *L) ! { ! wxLuaState wxlState(L); ! int returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call GetOptionInt ! returns = wxSystemOptions::GetOptionInt(name); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; ! } ! ! // static bool HasOption(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_HasOption(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call HasOption ! returns = wxSystemOptions::HasOption(name); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // static bool IsFalse(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_IsFalse(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call IsFalse ! returns = wxSystemOptions::IsFalse(name); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // static void SetOption(const wxString& name, const wxString& value) ! static int LUACALL wxLua_wxSystemOptions_SetOption(lua_State *L) ! { ! wxLuaState wxlState(L); ! // const wxString value ! const wxString value = lua2wx(wxlState.GetStringType(3)); ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call SetOption ! wxSystemOptions::SetOption(name, value); ! ! return 0; ! } ! ! // %rename SetOptionInt static void SetOption(const wxString& name, int value) ! static int LUACALL wxLua_wxSystemOptions_SetOptionInt(lua_State *L) ! { ! wxLuaState wxlState(L); ! // int value ! int value = (int)wxlState.GetNumberType(3); ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call SetOption ! wxSystemOptions::SetOption(name, value); ! ! return 0; ! } ! ! static int LUACALL wxLua_wxSystemOptions_destructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxSystemOptions * self = (wxSystemOptions *)wxlState.GetUserDataType(1, s_wxluatag_wxSystemOptions); ! ! // remove from tracked memory list ! if (self != 0) ! wxlState.RemoveTrackedMemory(self); ! return 0; ! } ! ! static int LUACALL wxLua_wxSystemOptions_Delete(lua_State *L) { - wxLuaState wxlState(L); - wxSystemOptions * self = (wxSystemOptions *)wxlState.GetUserDataType(1, s_wxluatag_wxSystemOptions); - // remove from tracked memory list - if (self != 0) - if (wxlState.RemoveTrackedMemory(self)) - { // if removed, reset the tag so that gc() is not called on this object. - lua_pushnil(L); - lua_setmetatable(L, -2); - } return 0; } --- 2181,2186 ---- int s_wxluatag_wxSystemOptions = -1; ! static int LUACALL wxLua_wxSystemOptions_destructor(lua_State *) { return 0; } *************** *** 2510,2521 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxSystemOptions_methods[] = { - { LuaMethod, "GetOption", wxLua_wxSystemOptions_GetOption, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "GetOptionInt", wxLua_wxSystemOptions_GetOptionInt, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "HasOption", wxLua_wxSystemOptions_HasOption, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "IsFalse", wxLua_wxSystemOptions_IsFalse, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetOption", wxLua_wxSystemOptions_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetOptionInt", wxLua_wxSystemOptions_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxSystemOptions", wxLua_wxSystemOptions_destructor, 0, 0, {0} }, - { LuaMethod, "Delete", wxLua_wxSystemOptions_Delete, 0, 0, {0} }, }; --- 2192,2196 ---- Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** dialogs.cpp 15 May 2006 22:57:30 -0000 1.15 --- dialogs.cpp 17 May 2006 22:47:10 -0000 1.16 *************** *** 1214,1218 **** long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCHOICEDLG_STYLE); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption const wxString caption = lua2wx(wxlState.GetStringType(3)); --- 1214,1218 ---- long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCHOICEDLG_STYLE); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(4, choices); // const wxString caption const wxString caption = lua2wx(wxlState.GetStringType(3)); *************** *** 1249,1253 **** #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_constructor, 6, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif --- 1249,1253 ---- #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_constructor, 6, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif *************** *** 1359,1363 **** #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxSingleChoiceDialog) ! { LuaConstructor, "wxSingleChoiceDialog", wxLua_wxSingleChoiceDialog_constructor, 7, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif --- 1359,1363 ---- #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxSingleChoiceDialog) ! { LuaConstructor, "wxSingleChoiceDialog", wxLua_wxSingleChoiceDialog_constructor, 7, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** data.cpp 2 May 2006 05:25:01 -0000 1.19 --- data.cpp 17 May 2006 22:47:10 -0000 1.20 *************** *** 1802,1806 **** wxArrayString *returns; // const wxArrayString_FromLuaTable array ! int dummy_count; wxArrayString array = wxArrayString(); dummy_count = wxlState.GetwxArrayString(1, array); // call constructor returns = new wxArrayString(array); --- 1802,1806 ---- wxArrayString *returns; // const wxArrayString_FromLuaTable array ! wxArrayString array = wxArrayString(); wxlState.GetwxArrayString(1, array); // call constructor returns = new wxArrayString(array); *************** *** 2070,2074 **** { LuaConstructor, "wxArrayString", wxLua_wxArrayString_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxArrayStringCopy", wxLua_wxArrayStringCopy_constructor, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, ! { LuaConstructor, "wxArrayStringFromTable", wxLua_wxArrayStringFromTable_constructor, 1, 1, { 0 } }, { LuaMethod, "Add", wxLua_wxArrayString_Add, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Alloc", wxLua_wxArrayString_Alloc, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 2070,2074 ---- { LuaConstructor, "wxArrayString", wxLua_wxArrayString_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxArrayStringCopy", wxLua_wxArrayStringCopy_constructor, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, ! { LuaConstructor, "wxArrayStringFromTable", wxLua_wxArrayStringFromTable_constructor, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaMethod, "Add", wxLua_wxArrayString_Add, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Alloc", wxLua_wxArrayString_Alloc, 1, 1, { &s_wxluaarg_Number, 0 } }, Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wx_bind.cpp 17 May 2006 05:02:05 -0000 1.40 --- wx_bind.cpp 17 May 2006 22:47:10 -0000 1.41 *************** *** 1505,1514 **** { "wxSYS_CAN_DRAW_FRAME_DECORATIONS", wxSYS_CAN_DRAW_FRAME_DECORATIONS }, { "wxSYS_CAN_ICONIZE_FRAME", wxSYS_CAN_ICONIZE_FRAME }, - { "wxSYS_COLOUR_GRADIENTACTIVECAPTION", wxSYS_COLOUR_GRADIENTACTIVECAPTION }, - { "wxSYS_COLOUR_GRADIENTINACTIVECAPTION", wxSYS_COLOUR_GRADIENTINACTIVECAPTION }, - { "wxSYS_COLOUR_HOTLIGHT", wxSYS_COLOUR_HOTLIGHT }, - { "wxSYS_COLOUR_MAX", wxSYS_COLOUR_MAX }, - { "wxSYS_COLOUR_MENUBAR", wxSYS_COLOUR_MENUBAR }, - { "wxSYS_COLOUR_MENUHILIGHT", wxSYS_COLOUR_MENUHILIGHT }, { "wxSYS_SCREEN_DESKTOP", wxSYS_SCREEN_DESKTOP }, { "wxSYS_SCREEN_NONE", wxSYS_SCREEN_NONE }, --- 1505,1508 ---- *************** *** 1903,1911 **** #if wxLUA_USE_wxConfig ! { "Type_Boolean", wxConfigBase::Type_Boolean }, ! { "Type_Float", wxConfigBase::Type_Float }, ! { "Type_Integer", wxConfigBase::Type_Integer }, ! { "Type_String", wxConfigBase::Type_String }, ! { "Type_Unknown", wxConfigBase::Type_Unknown }, { "wxCONFIG_USE_GLOBAL_FILE", wxCONFIG_USE_GLOBAL_FILE }, { "wxCONFIG_USE_LOCAL_FILE", wxCONFIG_USE_LOCAL_FILE }, --- 1897,1905 ---- #if wxLUA_USE_wxConfig ! { "wxConfigBase_Type_Boolean", wxConfigBase::Type_Boolean }, ! { "wxConfigBase_Type_Float", wxConfigBase::Type_Float }, ! { "wxConfigBase_Type_Integer", wxConfigBase::Type_Integer }, ! { "wxConfigBase_Type_String", wxConfigBase::Type_String }, ! { "wxConfigBase_Type_Unknown", wxConfigBase::Type_Unknown }, { "wxCONFIG_USE_GLOBAL_FILE", wxCONFIG_USE_GLOBAL_FILE }, { "wxCONFIG_USE_LOCAL_FILE", wxCONFIG_USE_LOCAL_FILE }, *************** *** 1963,1968 **** #if wxLUA_USE_wxDataObject ! { "Get", wxDataObject::Get }, ! { "Set", wxDataObject::Set }, { "wxDF_BITMAP", wxDF_BITMAP }, { "wxDF_DIB", wxDF_DIB }, --- 1957,1962 ---- #if wxLUA_USE_wxDataObject ! { "wxDataObject_Get", wxDataObject::Get }, ! { "wxDataObject_Set", wxDataObject::Set }, { "wxDF_BITMAP", wxDF_BITMAP }, { "wxDF_DIB", wxDF_DIB }, *************** *** 1987,2075 **** #if wxLUA_USE_wxDateTime ! { "ADT", wxDateTime::ADT }, ! { "AKDT", wxDateTime::AKDT }, ! { "AKST", wxDateTime::AKST }, ! { "AST", wxDateTime::AST }, ! { "A_CST", wxDateTime::A_CST }, ! { "A_ESST", wxDateTime::A_ESST }, ! { "A_EST", wxDateTime::A_EST }, ! { "A_WST", wxDateTime::A_WST }, ! { "Apr", wxDateTime::Apr }, ! { "Aug", wxDateTime::Aug }, ! { "CDT", wxDateTime::CDT }, ! { "CEST", wxDateTime::CEST }, ! { "CET", wxDateTime::CET }, ! { "CST", wxDateTime::CST }, ! { "Country_Default", wxDateTime::Country_Default }, ! { "Country_EEC", wxDateTime::Country_EEC }, ! { "Country_Unknown", wxDateTime::Country_Unknown }, ! { "Country_WesternEurope_End", wxDateTime::Country_WesternEurope_End }, ! { "Country_WesternEurope_Start", wxDateTime::Country_WesternEurope_Start }, ! { "Dec", wxDateTime::Dec }, ! { "EDT", wxDateTime::EDT }, ! { "EEST", wxDateTime::EEST }, ! { "EET", wxDateTime::EET }, ! { "EST", wxDateTime::EST }, ! { "Feb", wxDateTime::Feb }, ! { "France", wxDateTime::France }, ! { "Fri", wxDateTime::Fri }, ! { "GMT0", wxDateTime::GMT0 }, ! { "GMT1", wxDateTime::GMT1 }, ! { "GMT10", wxDateTime::GMT10 }, ! { "GMT11", wxDateTime::GMT11 }, ! { "GMT12", wxDateTime::GMT12 }, ! { "GMT2", wxDateTime::GMT2 }, ! { "GMT3", wxDateTime::GMT3 }, ! { "GMT4", wxDateTime::GMT4 }, ! { "GMT5", wxDateTime::GMT5 }, ! { "GMT6", wxDateTime::GMT6 }, ! { "GMT7", wxDateTime::GMT7 }, ! { "GMT8", wxDateTime::GMT8 }, ! { "GMT9", wxDateTime::GMT9 }, ! { "GMT_1", wxDateTime::GMT_1 }, ! { "GMT_10", wxDateTime::GMT_10 }, ! { "GMT_11", wxDateTime::GMT_11 }, ! { "GMT_12", wxDateTime::GMT_12 }, ! { "GMT_2", wxDateTime::GMT_2 }, ! { "GMT_3", wxDateTime::GMT_3 }, ! { "GMT_4", wxDateTime::GMT_4 }, ! { "GMT_5", wxDateTime::GMT_5 }, ! { "GMT_6", wxDateTime::GMT_6 }, ! { "GMT_7", wxDateTime::GMT_7 }, ! { "GMT_8", wxDateTime::GMT_8 }, ! { "GMT_9", wxDateTime::GMT_9 }, ! { "Germany", wxDateTime::Germany }, ! { "Gregorian", wxDateTime::Gregorian }, ! { "HST", wxDateTime::HST }, ! { "Inv_Month", wxDateTime::Inv_Month }, ! { "Inv_WeekDay", wxDateTime::Inv_WeekDay }, ! { "Jan", wxDateTime::Jan }, ! { "Jul", wxDateTime::Jul }, ! { "Julian", wxDateTime::Julian }, ! { "Jun", wxDateTime::Jun }, ! { "Local", wxDateTime::Local }, ! { "MDT", wxDateTime::MDT }, ! { "MSD", wxDateTime::MSD }, ! { "MSK", wxDateTime::MSK }, ! { "MST", wxDateTime::MST }, ! { "Mar", wxDateTime::Mar }, ! { "May", wxDateTime::May }, ! { "Mon", wxDateTime::Mon }, ! { "Nov", wxDateTime::Nov }, ! { "Oct", wxDateTime::Oct }, ! { "PDT", wxDateTime::PDT }, ! { "PST", wxDateTime::PST }, ! { "Russia", wxDateTime::Russia }, ! { "Sat", wxDateTime::Sat }, ! { "Sep", wxDateTime::Sep }, ! { "Sun", wxDateTime::Sun }, ! { "Thu", wxDateTime::Thu }, ! { "Tue", wxDateTime::Tue }, ! { "UK", wxDateTime::UK }, ! { "USA", wxDateTime::USA }, ! { "UTC", wxDateTime::UTC }, ! { "WEST", wxDateTime::WEST }, ! { "WET", wxDateTime::WET }, ! { "Wed", wxDateTime::Wed }, #endif --- 1981,2069 ---- #if wxLUA_USE_wxDateTime ! { "wxDateTime_ADT", wxDateTime::ADT }, ! { "wxDateTime_AKDT", wxDateTime::AKDT }, ! { "wxDateTime_AKST", wxDateTime::AKST }, ! { "wxDateTime_AST", wxDateTime::AST }, ! { "wxDateTime_A_CST", wxDateTime::A_CST }, ! { "wxDateTime_A_ESST", wxDateTime::A_ESST }, ! { "wxDateTime_A_EST", wxDateTime::A_EST }, ! { "wxDateTime_A_WST", wxDateTime::A_WST }, ! { "wxDateTime_Apr", wxDateTime::Apr }, ! { "wxDateTime_Aug", wxDateTime::Aug }, ! { "wxDateTime_CDT", wxDateTime::CDT }, ! { "wxDateTime_CEST", wxDateTime::CEST }, ! { "wxDateTime_CET", wxDateTime::CET }, ! { "wxDateTime_CST", wxDateTime::CST }, ! { "wxDateTime_Country_Default", wxDateTime::Country_Default }, ! { "wxDateTime_Country_EEC", wxDateTime::Country_EEC }, ! { "wxDateTime_Country_Unknown", wxDateTime::Country_Unknown }, ! { "wxDateTime_Country_WesternEurope_End", wxDateTime::Country_WesternEurope_End }, ! { "wxDateTime_Country_WesternEurope_Start", wxDateTime::Country_WesternEurope_Start }, ! { "wxDateTime_Dec", wxDateTime::Dec }, ! { "wxDateTime_EDT", wxDateTime::EDT }, ! { "wxDateTime_EEST", wxDateTime::EEST }, ! { "wxDateTime_EET", wxDateTime::EET }, ! { "wxDateTime_EST", wxDateTime::EST }, ! { "wxDateTime_Feb", wxDateTime::Feb }, ! { "wxDateTime_France", wxDateTime::France }, ! { "wxDateTime_Fri", wxDateTime::Fri }, ! { "wxDateTime_GMT0", wxDateTime::GMT0 }, ! { "wxDateTime_GMT1", wxDateTime::GMT1 }, ! { "wxDateTime_GMT10", wxDateTime::GMT10 }, ! { "wxDateTime_GMT11", wxDateTime::GMT11 }, ! { "wxDateTime_GMT12", wxDateTime::GMT12 }, ! { "wxDateTime_GMT2", wxDateTime::GMT2 }, ! { "wxDateTime_GMT3", wxDateTime::GMT3 }, ! { "wxDateTime_GMT4", wxDateTime::GMT4 }, ! { "wxDateTime_GMT5", wxDateTime::GMT5 }, ! { "wxDateTime_GMT6", wxDateTime::GMT6 }, ! { "wxDateTime_GMT7", wxDateTime::GMT7 }, ! { "wxDateTime_GMT8", wxDateTime::GMT8 }, ! { "wxDateTime_GMT9", wxDateTime::GMT9 }, ! { "wxDateTime_GMT_1", wxDateTime::GMT_1 }, ! { "wxDateTime_GMT_10", wxDateTime::GMT_10 }, ! { "wxDateTime_GMT_11", wxDateTime::GMT_11 }, ! { "wxDateTime_GMT_12", wxDateTime::GMT_12 }, ! { "wxDateTime_GMT_2", wxDateTime::GMT_2 }, ! { "wxDateTime_GMT_3", wxDateTime::GMT_3 }, ! { "wxDateTime_GMT_4", wxDateTime::GMT_4 }, ! { "wxDateTime_GMT_5", wxDateTime::GMT_5 }, ! { "wxDateTime_GMT_6", wxDateTime::GMT_6 }, ! { "wxDateTime_GMT_7", wxDateTime::GMT_7 }, ! { "wxDateTime_GMT_8", wxDateTime::GMT_8 }, ! { "wxDateTime_GMT_9", wxDateTime::GMT_9 }, ! { "wxDateTime_Germany", wxDateTime::Germany }, ! { "wxDateTime_Gregorian", wxDateTime::Gregorian }, ! { "wxDateTime_HST", wxDateTime::HST }, ! { "wxDateTime_Inv_Month", wxDateTime::Inv_Month }, ! { "wxDateTime_Inv_WeekDay", wxDateTime::Inv_WeekDay }, ! { "wxDateTime_Jan", wxDateTime::Jan }, ! { "wxDateTime_Jul", wxDateTime::Jul }, ! { "wxDateTime_Julian", wxDateTime::Julian }, ! { "wxDateTime_Jun", wxDateTime::Jun }, ! { "wxDateTime_Local", wxDateTime::Local }, ! { "wxDateTime_MDT", wxDateTime::MDT }, ! { "wxDateTime_MSD", wxDateTime::MSD }, ! { "wxDateTime_MSK", wxDateTime::MSK }, ! { "wxDateTime_MST", wxDateTime::MST }, ! { "wxDateTime_Mar", wxDateTime::Mar }, ! { "wxDateTime_May", wxDateTime::May }, ! { "wxDateTime_Mon", wxDateTime::Mon }, ! { "wxDateTime_Nov", wxDateTime::Nov }, ! { "wxDateTime_Oct", wxDateTime::Oct }, ! { "wxDateTime_PDT", wxDateTime::PDT }, ! { "wxDateTime_PST", wxDateTime::PST }, ! { "wxDateTime_Russia", wxDateTime::Russia }, ! { "wxDateTime_Sat", wxDateTime::Sat }, ! { "wxDateTime_Sep", wxDateTime::Sep }, ! { "wxDateTime_Sun", wxDateTime::Sun }, ! { "wxDateTime_Thu", wxDateTime::Thu }, ! { "wxDateTime_Tue", wxDateTime::Tue }, ! { "wxDateTime_UK", wxDateTime::UK }, ! { "wxDateTime_USA", wxDateTime::USA }, ! { "wxDateTime_UTC", wxDateTime::UTC }, ! { "wxDateTime_WEST", wxDateTime::WEST }, ! { "wxDateTime_WET", wxDateTime::WET }, ! { "wxDateTime_Wed", wxDateTime::Wed }, #endif *************** *** 2086,2094 **** #if wxLUA_USE_wxFile ! { "wxFileRead", wxFile::read }, ! { "wxFileReadWrite", wxFile::read_write }, ! { "wxFileWrite", wxFile::write }, ! { "wxFileWriteAppend", wxFile::write_append }, ! { "wxFileWriteExcl", wxFile::write_excl }, { "wxFILE_KIND_DISK", wxFILE_KIND_DISK }, { "wxFILE_KIND_PIPE", wxFILE_KIND_PIPE }, --- 2080,2088 ---- #if wxLUA_USE_wxFile ! { "wxFile_wxFileRead", wxFile::read }, ! { "wxFile_wxFileReadWrite", wxFile::read_write }, ! { "wxFile_wxFileWrite", wxFile::write }, ! { "wxFile_wxFileWriteAppend", wxFile::write_append }, ! { "wxFile_wxFileWriteExcl", wxFile::write_excl }, { "wxFILE_KIND_DISK", wxFILE_KIND_DISK }, { "wxFILE_KIND_PIPE", wxFILE_KIND_PIPE }, *************** *** 2249,2258 **** #if wxLUA_USE_wxGrid ! { "Any", wxGridCellAttr::Any }, ! { "Cell", wxGridCellAttr::Cell }, ! { "Col", wxGridCellAttr::Col }, ! { "Default", wxGridCellAttr::Default }, ! { "Merged", wxGridCellAttr::Merged }, ! { "Row", wxGridCellAttr::Row }, { "wxGRIDTABLE_NOTIFY_COLS_APPENDED", wxGRIDTABLE_NOTIFY_COLS_APPENDED }, { "wxGRIDTABLE_NOTIFY_COLS_DELETED", wxGRIDTABLE_NOTIFY_COLS_DELETED }, --- 2243,2252 ---- #if wxLUA_USE_wxGrid ! { "wxGridCellAttr_Any", wxGridCellAttr::Any }, ! { "wxGridCellAttr_Cell", wxGridCellAttr::Cell }, ! { "wxGridCellAttr_Col", wxGridCellAttr::Col }, ! { "wxGridCellAttr_Default", wxGridCellAttr::Default }, ! { "wxGridCellAttr_Merged", wxGridCellAttr::Merged }, ! { "wxGridCellAttr_Row", wxGridCellAttr::Row }, { "wxGRIDTABLE_NOTIFY_COLS_APPENDED", wxGRIDTABLE_NOTIFY_COLS_APPENDED }, { "wxGRIDTABLE_NOTIFY_COLS_DELETED", wxGRIDTABLE_NOTIFY_COLS_DELETED }, *************** *** 2263,2269 **** { "wxGRIDTABLE_REQUEST_VIEW_GET_VALUES", wxGRIDTABLE_REQUEST_VIEW_GET_VALUES }, { "wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES", wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES }, ! { "wxGridSelectCells", wxGrid::wxGridSelectCells }, ! { "wxGridSelectColumns", wxGrid::wxGridSelectColumns }, ! { "wxGridSelectRows", wxGrid::wxGridSelectRows }, #endif --- 2257,2263 ---- { "wxGRIDTABLE_REQUEST_VIEW_GET_VALUES", wxGRIDTABLE_REQUEST_VIEW_GET_VALUES }, { "wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES", wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES }, ! { "wxGrid_wxGridSelectCells", wxGrid::wxGridSelectCells }, ! { "wxGrid_wxGridSelectColumns", wxGrid::wxGridSelectColumns }, ! { "wxGrid_wxGridSelectRows", wxGrid::wxGridSelectRows }, #endif *************** *** 2514,2520 **** #if wxLUA_USE_wxSocket ! { "ASCII", wxFTP::ASCII }, ! { "BINARY", wxFTP::BINARY }, ! { "NONE", wxFTP::NONE }, { "wxPROTO_ABRT", wxPROTO_ABRT }, { "wxPROTO_CONNERR", wxPROTO_CONNERR }, --- 2508,2514 ---- #if wxLUA_USE_wxSocket ! { "wxFTP_ASCII", wxFTP::ASCII }, ! { "wxFTP_BINARY", wxFTP::BINARY }, ! { "wxFTP_NONE", wxFTP::NONE }, { "wxPROTO_ABRT", wxPROTO_ABRT }, { "wxPROTO_CONNERR", wxPROTO_CONNERR }, *************** *** 2600,2606 **** --- 2594,2603 ---- { "wxSYS_COLOUR_CAPTIONTEXT", wxSYS_COLOUR_CAPTIONTEXT }, { "wxSYS_COLOUR_DESKTOP", wxSYS_COLOUR_DESKTOP }, + { "wxSYS_COLOUR_GRADIENTACTIVECAPTION", wxSYS_COLOUR_GRADIENTACTIVECAPTION }, + { "wxSYS_COLOUR_GRADIENTINACTIVECAPTION", wxSYS_COLOUR_GRADIENTINACTIVECAPTION }, { "wxSYS_COLOUR_GRAYTEXT", wxSYS_COLOUR_GRAYTEXT }, { "wxSYS_COLOUR_HIGHLIGHT", wxSYS_COLOUR_HIGHLIGHT }, { "wxSYS_COLOUR_HIGHLIGHTTEXT", wxSYS_COLOUR_HIGHLIGHTTEXT }, + { "wxSYS_COLOUR_HOTLIGHT", wxSYS_COLOUR_HOTLIGHT }, { "wxSYS_COLOUR_INACTIVEBORDER", wxSYS_COLOUR_INACTIVEBORDER }, { "wxSYS_COLOUR_INACTIVECAPTION", wxSYS_COLOUR_INACTIVECAPTION }, *************** *** 2609,2613 **** --- 2606,2613 ---- { "wxSYS_COLOUR_INFOTEXT", wxSYS_COLOUR_INFOTEXT }, { "wxSYS_COLOUR_LISTBOX", wxSYS_COLOUR_LISTBOX }, + { "wxSYS_COLOUR_MAX", wxSYS_COLOUR_MAX }, { "wxSYS_COLOUR_MENU", wxSYS_COLOUR_MENU }, + { "wxSYS_COLOUR_MENUBAR", wxSYS_COLOUR_MENUBAR }, + { "wxSYS_COLOUR_MENUHILIGHT", wxSYS_COLOUR_MENUHILIGHT }, { "wxSYS_COLOUR_MENUTEXT", wxSYS_COLOUR_MENUTEXT }, { "wxSYS_COLOUR_SCROLLBAR", wxSYS_COLOUR_SCROLLBAR }, *************** *** 3056,3084 **** - #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxSystemSettings) - - // %wxchkver23 %static wxFont GetFont(wxSystemFont index) - static int LUACALL wxLua_wxSystemSettings_GetFont(lua_State *L) - { - wxLuaState wxlState(L); - wxFont *returns; - // wxSystemFont index - wxSystemFont index = (wxSystemFont)wxlState.GetEnumerationType(1); - // call GetFont - // allocate a new object using... [truncated message content] |
