Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src gdi.cpp, 1.75, 1.76 picker.cpp, 1.3, 1.4 windows.cpp, 1.66, 1.67 wx_bind.cpp, 1.113, 1.114
|
From: John L. <jr...@us...> - 2007-06-19 22:26:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/modules/wxbind/src Modified Files: gdi.cpp picker.cpp windows.cpp wx_bind.cpp Log Message: Add samples for picker and other controls Fix some binding problems found from the samples Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** windows.cpp 18 Jun 2007 21:40:50 -0000 1.66 --- windows.cpp 19 Jun 2007 22:26:48 -0000 1.67 *************** *** 10511,10515 **** ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePane --- 10511,10515 ---- ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePane *************** *** 10539,10543 **** ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Create[] = { &s_wxluatag_wxCollapsiblePane, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_Create(lua_State *L); --- 10539,10543 ---- ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Create[] = { &s_wxluatag_wxCollapsiblePane, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_Create(lua_State *L); *************** *** 10576,10580 **** } ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Expand[] = { &s_wxluatag_wxCollapsiblePane, NULL }; --- 10576,10580 ---- } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Expand[] = { &s_wxluatag_wxCollapsiblePane, NULL }; *************** *** 10648,10652 **** ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_constructor1(lua_State *L); --- 10648,10652 ---- ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_constructor1(lua_State *L); *************** *** 10686,10690 **** } ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxCollapsiblePane_constructor(lua_State *L); --- 10686,10690 ---- } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxCollapsiblePane_constructor(lua_State *L); *************** *** 10709,10713 **** ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePane_constructor_overload(lua_State *L); // function overload table --- 10709,10713 ---- ! #if (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePane_constructor_overload(lua_State *L); // function overload table *************** *** 10716,10722 **** { wxLua_wxCollapsiblePane_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1 }, ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 10716,10722 ---- { wxLua_wxCollapsiblePane_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 10730,10734 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions --- 10730,10734 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions *************** *** 10736,10742 **** { "Collapse", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Collapse, 1, NULL }, ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Create, 1, NULL }, ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { "Expand", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Expand, 1, NULL }, --- 10736,10742 ---- { "Collapse", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Collapse, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Create, 1, NULL }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "Expand", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Expand, 1, NULL }, *************** *** 10745,10751 **** { "IsExpanded", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_IsExpanded, 1, NULL }, ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePane", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, --- 10745,10751 ---- { "IsExpanded", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_IsExpanded, 1, NULL }, ! #if (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePane", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload_count, 0 }, ! #endif // (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, *************** *** 10754,10761 **** int wxCollapsiblePane_methodCount = sizeof(wxCollapsiblePane_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePaneEvent --- 10754,10761 ---- int wxCollapsiblePane_methodCount = sizeof(wxCollapsiblePane_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePaneEvent *************** *** 10817,10821 **** ! #if (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor1(lua_State *L); --- 10817,10821 ---- ! #if (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor1(lua_State *L); *************** *** 10843,10847 **** } ! #endif // (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor(lua_State *L); --- 10843,10847 ---- } ! #endif // (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor(lua_State *L); *************** *** 10866,10870 **** ! #if ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor_overload(lua_State *L); // function overload table --- 10866,10870 ---- ! #if ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor_overload(lua_State *L); // function overload table *************** *** 10873,10879 **** { wxLua_wxCollapsiblePaneEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) { wxLua_wxCollapsiblePaneEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1 }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) { wxLua_wxCollapsiblePaneEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 10873,10879 ---- { wxLua_wxCollapsiblePaneEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { wxLua_wxCollapsiblePaneEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1 }, ! #endif // (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { wxLua_wxCollapsiblePaneEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 10887,10891 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions --- 10887,10891 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions *************** *** 10895,10901 **** { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_delete, 1, NULL }, ! #if ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePaneEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload_count, 0 }, ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, --- 10895,10901 ---- { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_delete, 1, NULL }, ! #if ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePaneEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, *************** *** 10904,10908 **** int wxCollapsiblePaneEvent_methodCount = sizeof(wxCollapsiblePaneEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE --- 10904,10908 ---- int wxCollapsiblePaneEvent_methodCount = sizeof(wxCollapsiblePaneEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** wx_bind.cpp 19 Jun 2007 13:58:16 -0000 1.113 --- wx_bind.cpp 19 Jun 2007 22:26:49 -0000 1.114 *************** *** 108,126 **** { "wxEVT_COMMAND_CHOICE_SELECTED", &wxEVT_COMMAND_CHOICE_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COLOURPICKER_CHANGED", &wxEVT_COMMAND_COLOURPICKER_CHANGED, &s_wxluatag_wxColourPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COMBOBOX_SELECTED", &wxEVT_COMMAND_COMBOBOX_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_DIRPICKER_CHANGED", &wxEVT_COMMAND_DIRPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_ENTER", &wxEVT_COMMAND_ENTER, &s_wxluatag_wxCommandEvent }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_FILEPICKER_CHANGED", &wxEVT_COMMAND_FILEPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog --- 108,130 ---- { "wxEVT_COMMAND_CHOICE_SELECTED", &wxEVT_COMMAND_CHOICE_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! { "wxEVT_COMMAND_COLLPANE_CHANGED", &wxEVT_COMMAND_COLLPANE_CHANGED, &s_wxluatag_wxCollapsiblePaneEvent }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COLOURPICKER_CHANGED", &wxEVT_COMMAND_COLOURPICKER_CHANGED, &s_wxluatag_wxColourPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COMBOBOX_SELECTED", &wxEVT_COMMAND_COMBOBOX_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_DIRPICKER_CHANGED", &wxEVT_COMMAND_DIRPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_ENTER", &wxEVT_COMMAND_ENTER, &s_wxluatag_wxCommandEvent }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_FILEPICKER_CHANGED", &wxEVT_COMMAND_FILEPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog *************** *** 132,138 **** #endif // wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxEVT_COMMAND_FONTPICKER_CHANGED", &wxEVT_COMMAND_FONTPICKER_CHANGED, &s_wxluatag_wxFontPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl --- 136,142 ---- #endif // wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxEVT_COMMAND_FONTPICKER_CHANGED", &wxEVT_COMMAND_FONTPICKER_CHANGED, &s_wxluatag_wxFontPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl *************** *** 765,772 **** #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, --- 769,776 ---- #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, *************** *** 802,811 **** #endif // wxLUA_USE_wxDC ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxARCH_32", wxARCH_32 }, --- 806,815 ---- #endif // wxLUA_USE_wxDC ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxARCH_32", wxARCH_32 }, *************** *** 1045,1053 **** #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxFrame) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCLRP_DEFAULT_STYLE", wxCLRP_DEFAULT_STYLE }, { "wxCLRP_SHOW_LABEL", wxCLRP_SHOW_LABEL }, { "wxCLRP_USE_TEXTCTRL", wxCLRP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCOLOURED", wxCOLOURED }, --- 1049,1057 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxFrame) ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCLRP_DEFAULT_STYLE", wxCLRP_DEFAULT_STYLE }, { "wxCLRP_SHOW_LABEL", wxCLRP_SHOW_LABEL }, { "wxCLRP_USE_TEXTCTRL", wxCLRP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCOLOURED", wxCOLOURED }, *************** *** 1072,1078 **** #endif // !wxCHECK_VERSION(2,8,0) ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCP_DEFAULT_STYLE", wxCP_DEFAULT_STYLE }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush --- 1076,1082 ---- #endif // !wxCHECK_VERSION(2,8,0) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCP_DEFAULT_STYLE", wxCP_DEFAULT_STYLE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush *************** *** 1233,1242 **** #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDIRP_CHANGE_DIR", wxDIRP_CHANGE_DIR }, { "wxDIRP_DEFAULT_STYLE", wxDIRP_DEFAULT_STYLE }, { "wxDIRP_DIR_MUST_EXIST", wxDIRP_DIR_MUST_EXIST }, { "wxDIRP_USE_TEXTCTRL", wxDIRP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDir --- 1237,1246 ---- #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDIRP_CHANGE_DIR", wxDIRP_CHANGE_DIR }, { "wxDIRP_DEFAULT_STYLE", wxDIRP_DEFAULT_STYLE }, { "wxDIRP_DIR_MUST_EXIST", wxDIRP_DIR_MUST_EXIST }, { "wxDIRP_USE_TEXTCTRL", wxDIRP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDir *************** *** 1265,1269 **** { "wxDOWN", wxDOWN }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, --- 1269,1273 ---- { "wxDOWN", wxDOWN }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, *************** *** 1271,1275 **** { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE --- 1275,1279 ---- { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE *************** *** 1312,1319 **** { "wxEVENT_PROPAGATE_NONE", wxEVENT_PROPAGATE_NONE }, - #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - { "wxEVT_COMMAND_COLLPANE_CHANGED", wxEVT_COMMAND_COLLPANE_CHANGED }, - #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - #if wxLUA_USE_wxProcess { "wxEXEC_ASYNC", wxEXEC_ASYNC }, --- 1316,1319 ---- *************** *** 1385,1389 **** #endif // wxLUA_USE_wxDC ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFLP_CHANGE_DIR", wxFLP_CHANGE_DIR }, { "wxFLP_DEFAULT_STYLE", wxFLP_DEFAULT_STYLE }, --- 1385,1389 ---- #endif // wxLUA_USE_wxDC ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFLP_CHANGE_DIR", wxFLP_CHANGE_DIR }, { "wxFLP_DEFAULT_STYLE", wxFLP_DEFAULT_STYLE }, *************** *** 1393,1404 **** { "wxFLP_SAVE", wxFLP_SAVE }, { "wxFLP_USE_TEXTCTRL", wxFLP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFNTP_DEFAULT_STYLE", wxFNTP_DEFAULT_STYLE }, { "wxFNTP_FONTDESC_AS_LABEL", wxFNTP_FONTDESC_AS_LABEL }, { "wxFNTP_MAXPOINT_SIZE", wxFNTP_MAXPOINT_SIZE }, { "wxFNTP_USE_TEXTCTRL", wxFNTP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFont --- 1393,1405 ---- { "wxFLP_SAVE", wxFLP_SAVE }, { "wxFLP_USE_TEXTCTRL", wxFLP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFNTP_DEFAULT_STYLE", wxFNTP_DEFAULT_STYLE }, { "wxFNTP_FONTDESC_AS_LABEL", wxFNTP_FONTDESC_AS_LABEL }, { "wxFNTP_MAXPOINT_SIZE", wxFNTP_MAXPOINT_SIZE }, + { "wxFNTP_USEFONT_FOR_LABEL", wxFNTP_USEFONT_FOR_LABEL }, { "wxFNTP_USE_TEXTCTRL", wxFNTP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFont *************** *** 2741,2747 **** #endif // wxLUA_USE_wxFileName ! #if wxchkver_2_8 && wxLUA_USE_wxPicker { "wxPB_USE_TEXTCTRL", wxPB_USE_TEXTCTRL }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxPicker #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog --- 2742,2748 ---- #endif // wxLUA_USE_wxFileName ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker { "wxPB_USE_TEXTCTRL", wxPB_USE_TEXTCTRL }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog *************** *** 3668,3671 **** --- 3669,3673 ---- #endif // wxLUA_USE_wxArtProvider + { "wxDirSelectorPromptStr", wxDirSelectorPromptStr }, { "wxFILE_SEP_DSK", wxT(":") }, { "wxFILE_SEP_EXT", wxT(".") }, *************** *** 3676,3679 **** --- 3678,3686 ---- { "wxFILE_SEP_PATH_VMS", wxT(".") }, + #if wxLUA_USE_wxFileDialog && wxUSE_FILEDLG + { "wxFileSelectorDefaultWildcardStr", wxFileSelectorDefaultWildcardStr }, + { "wxFileSelectorPromptStr", wxFileSelectorPromptStr }, + #endif // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG + #if wxLUA_USE_wxGrid && wxUSE_GRID { "wxGRID_VALUE_BOOL", wxGRID_VALUE_BOOL }, *************** *** 6697,6704 **** { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 #if wxLUA_USE_wxApp --- 6704,6711 ---- { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL #if wxLUA_USE_wxApp *************** *** 6847,6854 **** { "wxCloseEvent", wxCloseEvent_methods, wxCloseEvent_methodCount, CLASSINFO(wxCloseEvent), &s_wxluatag_wxCloseEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCollapsiblePane", wxCollapsiblePane_methods, wxCollapsiblePane_methodCount, CLASSINFO(wxCollapsiblePane), &s_wxluatag_wxCollapsiblePane, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, { "wxCollapsiblePaneEvent", wxCollapsiblePaneEvent_methods, wxCollapsiblePaneEvent_methodCount, CLASSINFO(wxCollapsiblePaneEvent), &s_wxluatag_wxCollapsiblePaneEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush --- 6854,6861 ---- { "wxCloseEvent", wxCloseEvent_methods, wxCloseEvent_methodCount, CLASSINFO(wxCloseEvent), &s_wxluatag_wxCloseEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCollapsiblePane", wxCollapsiblePane_methods, wxCollapsiblePane_methodCount, CLASSINFO(wxCollapsiblePane), &s_wxluatag_wxCollapsiblePane, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, { "wxCollapsiblePaneEvent", wxCollapsiblePaneEvent_methods, wxCollapsiblePaneEvent_methodCount, CLASSINFO(wxCollapsiblePaneEvent), &s_wxluatag_wxCollapsiblePaneEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush *************** *** 6868,6875 **** #endif // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxColourPickerCtrl", wxColourPickerCtrl_methods, wxColourPickerCtrl_methodCount, CLASSINFO(wxColourPickerCtrl), &s_wxluatag_wxColourPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxColourPickerEvent", wxColourPickerEvent_methods, wxColourPickerEvent_methodCount, CLASSINFO(wxColourPickerEvent), &s_wxluatag_wxColourPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) #if wxLUA_USE_wxComboBox && wxUSE_COMBOBOX --- 6875,6882 ---- #endif // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxColourPickerCtrl", wxColourPickerCtrl_methods, wxColourPickerCtrl_methodCount, CLASSINFO(wxColourPickerCtrl), &s_wxluatag_wxColourPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxColourPickerEvent", wxColourPickerEvent_methods, wxColourPickerEvent_methodCount, CLASSINFO(wxColourPickerEvent), &s_wxluatag_wxColourPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) #if wxLUA_USE_wxComboBox && wxUSE_COMBOBOX *************** *** 6947,6953 **** #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME --- 6954,6960 ---- #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME *************** *** 6977,6983 **** #endif // wxLUA_USE_wxDirDialog && wxUSE_DIRDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDirPickerCtrl", wxDirPickerCtrl_methods, wxDirPickerCtrl_methodCount, CLASSINFO(wxDirPickerCtrl), &s_wxluatag_wxDirPickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 6984,6990 ---- #endif // wxLUA_USE_wxDirDialog && wxUSE_DIRDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDirPickerCtrl", wxDirPickerCtrl_methods, wxDirPickerCtrl_methodCount, CLASSINFO(wxDirPickerCtrl), &s_wxluatag_wxDirPickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY *************** *** 7032,7039 **** #endif // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileDirPickerCtrlBase", wxFileDirPickerCtrlBase_methods, wxFileDirPickerCtrlBase_methodCount, CLASSINFO(wxFileDirPickerCtrlBase), &s_wxluatag_wxFileDirPickerCtrlBase, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFileDirPickerEvent", wxFileDirPickerEvent_methods, wxFileDirPickerEvent_methodCount, CLASSINFO(wxFileDirPickerEvent), &s_wxluatag_wxFileDirPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE --- 7039,7046 ---- #endif // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileDirPickerCtrlBase", wxFileDirPickerCtrlBase_methods, wxFileDirPickerCtrlBase_methodCount, CLASSINFO(wxFileDirPickerCtrlBase), &s_wxluatag_wxFileDirPickerCtrlBase, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFileDirPickerEvent", wxFileDirPickerEvent_methods, wxFileDirPickerEvent_methodCount, CLASSINFO(wxFileDirPickerEvent), &s_wxluatag_wxFileDirPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 7053,7059 **** #endif // wxUSE_STREAMS ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFilePickerCtrl", wxFilePickerCtrl_methods, wxFilePickerCtrl_methodCount, CLASSINFO(wxFilePickerCtrl), &s_wxluatag_wxFilePickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileType", wxFileType_methods, wxFileType_methodCount, NULL, &s_wxluatag_wxFileType, NULL, NULL ,s_wxluadefineArray_None, 0, }, --- 7060,7066 ---- #endif // wxUSE_STREAMS ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFilePickerCtrl", wxFilePickerCtrl_methods, wxFilePickerCtrl_methodCount, CLASSINFO(wxFilePickerCtrl), &s_wxluatag_wxFilePickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileType", wxFileType_methods, wxFileType_methodCount, NULL, &s_wxluatag_wxFileType, NULL, NULL ,s_wxluadefineArray_None, 0, }, *************** *** 7094,7101 **** #endif // wxLUA_USE_wxFontMapper ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFontPickerCtrl", wxFontPickerCtrl_methods, wxFontPickerCtrl_methodCount, CLASSINFO(wxFontPickerCtrl), &s_wxluatag_wxFontPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFontPickerEvent", wxFontPickerEvent_methods, wxFontPickerEvent_methodCount, CLASSINFO(wxFontPickerEvent), &s_wxluatag_wxFontPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFrame --- 7101,7108 ---- #endif // wxLUA_USE_wxFontMapper ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFontPickerCtrl", wxFontPickerCtrl_methods, wxFontPickerCtrl_methodCount, CLASSINFO(wxFontPickerCtrl), &s_wxluatag_wxFontPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFontPickerEvent", wxFontPickerEvent_methods, wxFontPickerEvent_methodCount, CLASSINFO(wxFontPickerEvent), &s_wxluatag_wxFontPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFrame *************** *** 7497,7503 **** #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxPenList) ! #if wxchkver_2_8 && wxLUA_USE_wxPicker { "wxPickerBase", wxPickerBase_methods, wxPickerBase_methodCount, CLASSINFO(wxPickerBase), &s_wxluatag_wxPickerBase, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxPicker { "wxPlatformInfo", wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &s_wxluatag_wxPlatformInfo, NULL, NULL ,s_wxluadefineArray_None, 0, }, --- 7504,7510 ---- #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxPenList) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker { "wxPickerBase", wxPickerBase_methods, wxPickerBase_methodCount, CLASSINFO(wxPickerBase), &s_wxluatag_wxPickerBase, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker { "wxPlatformInfo", wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &s_wxluatag_wxPlatformInfo, NULL, NULL ,s_wxluadefineArray_None, 0, }, Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** gdi.cpp 18 Jun 2007 21:40:42 -0000 1.75 --- gdi.cpp 19 Jun 2007 22:26:47 -0000 1.76 *************** *** 14852,14856 **** ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 // --------------------------------------------------------------------------- // Bind class wxAnimation --- 14852,14856 ---- ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimation *************** *** 14881,14885 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); --- 14881,14885 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); *************** *** 14905,14909 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; --- 14905,14909 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14926,14930 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); --- 14926,14930 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); *************** *** 14948,14952 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; --- 14948,14952 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14969,14973 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); --- 14969,14973 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); *************** *** 14994,14998 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; --- 14994,14998 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; *************** *** 15087,15091 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table --- 15087,15091 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table *************** *** 15106,15110 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) // Map Lua Class Methods to C Binding Functions --- 15106,15110 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions *************** *** 15112,15136 **** { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) { 0, 0, 0, 0 }, --- 15112,15136 ---- { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, *************** *** 15139,15146 **** int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl --- 15139,15146 ---- int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl *************** *** 15150,15154 **** int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); --- 15150,15154 ---- int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); *************** *** 15185,15189 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15185,15189 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15209,15213 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); --- 15209,15213 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); *************** *** 15231,15235 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15231,15235 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15335,15339 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); --- 15335,15339 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); *************** *** 15353,15357 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15353,15357 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15371,15375 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); --- 15371,15375 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); *************** *** 15407,15411 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); --- 15407,15411 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); *************** *** 15430,15434 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table --- 15430,15434 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table *************** *** 15448,15454 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) ! #if ((wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table --- 15448,15454 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table *************** *** 15457,15463 **** { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 15457,15463 ---- { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; ***... [truncated message content] |
