From: John L. <jr...@us...> - 2007-06-17 18:36:39
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Add picker.i for all of the wxPicker controls Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity. Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** wxstc_datatypes.lua 14 Jun 2007 23:59:41 -0000 1.58 --- wxstc_datatypes.lua 17 Jun 2007 18:36:06 -0000 1.59 *************** *** 596,599 **** --- 596,613 ---- Name = "wxColourDialog", }, + wxColourPickerCtrl = { + BaseClass = "wxPickerBase", + Condition = "(wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxColourPickerCtrl", + }, + wxColourPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxColourPickerEvent", + }, wxComboBox = { BaseClass = "wxControlWithItems", *************** *** 778,782 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL", DefType = "class", IsNumber = false, --- 792,796 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "(wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", DefType = "class", IsNumber = false, *************** *** 870,873 **** --- 884,894 ---- Name = "wxDirDialog", }, + wxDirPickerCtrl = { + BaseClass = "wxFileDirPickerCtrlBase", + Condition = "(wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxDirPickerCtrl", + }, wxDirection = { DefType = "enum", *************** *** 1062,1065 **** --- 1083,1100 ---- Name = "wxFileDialog", }, + wxFileDirPickerCtrlBase = { + BaseClass = "wxPickerBase", + Condition = "((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFileDirPickerCtrlBase", + }, + wxFileDirPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFileDirPickerEvent", + }, wxFileHistory = { BaseClass = "wxObject", *************** *** 1101,1104 **** --- 1136,1146 ---- Name = "wxFileOutputStream", }, + wxFilePickerCtrl = { + BaseClass = "wxFileDirPickerCtrlBase", + Condition = "(wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFilePickerCtrl", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 1214,1217 **** --- 1256,1273 ---- Name = "wxFontMapper", }, + wxFontPickerCtrl = { + BaseClass = "wxPickerBase", + Condition = "(wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFontPickerCtrl", + }, + wxFontPickerEvent = { + BaseClass = "wxCommandEvent", + Condition = "(wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)", + DefType = "class", + IsNumber = false, + Name = "wxFontPickerEvent", + }, wxFontStyle = { Condition = "wxLUA_USE_wxFont", *************** *** 2493,2496 **** --- 2549,2559 ---- Name = "wxPenList", }, + wxPickerBase = { + BaseClass = "wxControl", + Condition = "wxchkver_2_8 && wxLUA_USE_wxPicker", + DefType = "class", + IsNumber = false, + Name = "wxPickerBase", + }, wxPoint = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 3749,3752 **** --- 3812,3816 ---- wxLUA_USE_wxColourDialog = "wxLUA_USE_wxColourDialog", wxLUA_USE_wxColourPenBrush = "wxLUA_USE_wxColourPenBrush", + wxLUA_USE_wxColourPickerCtrl = "wxLUA_USE_wxColourPickerCtrl", wxLUA_USE_wxComboBox = "wxLUA_USE_wxComboBox", wxLUA_USE_wxCommandProcessor = "wxLUA_USE_wxCommandProcessor", *************** *** 3764,3767 **** --- 3828,3832 ---- wxLUA_USE_wxDir = "wxLUA_USE_wxDir", wxLUA_USE_wxDirDialog = "wxLUA_USE_wxDirDialog", + wxLUA_USE_wxDirPickerCtrl = "wxLUA_USE_wxDirPickerCtrl", wxLUA_USE_wxDisplay = "wxLUA_USE_wxDisplay", wxLUA_USE_wxDragDrop = "wxLUA_USE_wxDragDrop", *************** *** 3770,3773 **** --- 3835,3839 ---- wxLUA_USE_wxFileHistory = "wxLUA_USE_wxFileHistory", wxLUA_USE_wxFileName = "wxLUA_USE_wxFileName", + wxLUA_USE_wxFilePickerCtrl = "wxLUA_USE_wxFilePickerCtrl", wxLUA_USE_wxFindReplaceDialog = "wxLUA_USE_wxFindReplaceDialog", wxLUA_USE_wxFont = "wxLUA_USE_wxFont", *************** *** 3776,3779 **** --- 3842,3846 ---- wxLUA_USE_wxFontList = "wxLUA_USE_wxFontList", wxLUA_USE_wxFontMapper = "wxLUA_USE_wxFontMapper", + wxLUA_USE_wxFontPickerCtrl = "wxLUA_USE_wxFontPickerCtrl", wxLUA_USE_wxFrame = "wxLUA_USE_wxFrame", wxLUA_USE_wxGLCanvas = "wxLUA_USE_wxGLCanvas", *************** *** 3808,3811 **** --- 3875,3879 ---- wxLUA_USE_wxPalette = "wxLUA_USE_wxPalette", wxLUA_USE_wxPenList = "wxLUA_USE_wxPenList", + wxLUA_USE_wxPicker = "wxLUA_USE_wxPicker", wxLUA_USE_wxPointSizeRect = "wxLUA_USE_wxPointSizeRect", wxLUA_USE_wxPrint = "wxLUA_USE_wxPrint", *************** *** 3871,3874 **** --- 3939,3943 ---- wxUSE_CMDLINE_PARSER = "wxUSE_CMDLINE_PARSER", wxUSE_COLOURDLG = "wxUSE_COLOURDLG", + wxUSE_COLOURPICKERCTRL = "wxUSE_COLOURPICKERCTRL", wxUSE_COMBOBOX = "wxUSE_COMBOBOX", wxUSE_CONFIG = "wxUSE_CONFIG", *************** *** 3882,3885 **** --- 3951,3955 ---- wxUSE_DIALUP_MANAGER = "wxUSE_DIALUP_MANAGER", wxUSE_DIRDLG = "wxUSE_DIRDLG", + wxUSE_DIRPICKERCTRL = "wxUSE_DIRPICKERCTRL", wxUSE_DISPLAY = "wxUSE_DISPLAY", wxUSE_DOC_VIEW_ARCHITECTURE = "wxUSE_DOC_VIEW_ARCHITECTURE", *************** *** 3895,3902 **** --- 3965,3974 ---- wxUSE_FILE = "wxUSE_FILE", wxUSE_FILEDLG = "wxUSE_FILEDLG", + wxUSE_FILEPICKERCTRL = "wxUSE_FILEPICKERCTRL", wxUSE_FILESYSTEM = "wxUSE_FILESYSTEM", wxUSE_FINDREPLDLG = "wxUSE_FINDREPLDLG", wxUSE_FONTDLG = "wxUSE_FONTDLG", wxUSE_FONTMAP = "wxUSE_FONTMAP", + wxUSE_FONTPICKERCTRL = "wxUSE_FONTPICKERCTRL", wxUSE_FREETYPE = "wxUSE_FREETYPE", wxUSE_FSVOLUME = "wxUSE_FSVOLUME", |