From: John L. <jr...@us...> - 2007-01-18 17:19:11
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/wxLua/bindings/wxwidgets Modified Files: datetime.i wx_datatypes.lua Log Message: updated wxUSE_XXX ifdefs for date time Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** datetime.i 7 Dec 2006 06:32:42 -0000 1.20 --- datetime.i 18 Jan 2007 17:19:01 -0000 1.21 *************** *** 25,29 **** // wxDateTime ! %if wxLUA_USE_wxDateTime %include "wx/datetime.h" --- 25,29 ---- // wxDateTime ! %if wxLUA_USE_wxDateTime & wxUSE_DATETIME %include "wx/datetime.h" *************** *** 225,234 **** %endclass ! %endif //wxLUA_USE_wxDateTime //----------------------------------------------------------------------------- // wxTimeSpan ! %if wxLUA_USE_wxTimeSpan %include "wx/datetime.h" --- 225,234 ---- %endclass ! %endif //wxLUA_USE_wxDateTime & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxTimeSpan ! %if wxLUA_USE_wxTimeSpan & wxUSE_DATETIME %include "wx/datetime.h" *************** *** 275,284 **** %endclass ! %endif //wxLUA_USE_wxTimeSpan //----------------------------------------------------------------------------- // wxDateSpan ! %if wxLUA_USE_wxDateSpan %include "wx/datetime.h" --- 275,284 ---- %endclass ! %endif //wxLUA_USE_wxTimeSpan & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxDateSpan ! %if wxLUA_USE_wxDateSpan & wxUSE_DATETIME %include "wx/datetime.h" *************** *** 319,328 **** %endclass ! %endif //wxLUA_USE_wxDateSpan //----------------------------------------------------------------------------- // wxDateTimeHolidayAuthority ! %if wxLUA_USE_wxDateTimeHolidayAuthority %class %noclassinfo %encapsulate wxDateTimeHolidayAuthority --- 319,328 ---- %endclass ! %endif //wxLUA_USE_wxDateSpan & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxDateTimeHolidayAuthority ! %if wxLUA_USE_wxDateTimeHolidayAuthority & wxUSE_DATETIME %class %noclassinfo %encapsulate wxDateTimeHolidayAuthority *************** *** 343,352 **** %endclass ! %endif //wxLUA_USE_wxDateTimeHolidayAuthority //----------------------------------------------------------------------------- // wxTimer ! %if wxLUA_USE_wxTimer %include "wx/timer.h" --- 343,352 ---- %endclass ! %endif //wxLUA_USE_wxDateTimeHolidayAuthority & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxTimer ! %if wxLUA_USE_wxTimer & wxUSE_TIMER %include "wx/timer.h" *************** *** 378,387 **** %endclass ! %endif //wxLUA_USE_wxTimer //----------------------------------------------------------------------------- // wxCalendarCtrl ! %if wxLUA_USE_wxCalendarCtrl %include "wx/calctrl.h" --- 378,387 ---- %endclass ! %endif //wxLUA_USE_wxTimer & wxUSE_TIMER //----------------------------------------------------------------------------- // wxCalendarCtrl ! %if wxLUA_USE_wxCalendarCtrl & wxUSE_CALENDARCTRL %include "wx/calctrl.h" *************** *** 515,524 **** %endclass ! %endif //wxLUA_USE_wxCalendarCtrl //----------------------------------------------------------------------------- // wxDatePickerCtrl ! %if wxLUA_USE_wxDatePickerCtrl %include "wx/datectrl.h" --- 515,524 ---- %endclass ! %endif //wxLUA_USE_wxCalendarCtrl & wxUSE_CALENDARCTRL //----------------------------------------------------------------------------- // wxDatePickerCtrl ! %if wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL %include "wx/datectrl.h" *************** *** 543,546 **** %endclass ! %endif //wxLUA_USE_wxDatePickerCtrl --- 543,546 ---- %endclass ! %endif //wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wx_datatypes.lua 19 Dec 2006 06:18:02 -0000 1.44 --- wx_datatypes.lua 18 Jan 2007 17:19:01 -0000 1.45 *************** *** 413,417 **** wxCalendarCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 413,417 ---- wxCalendarCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 419,423 **** }, wxCalendarDateAttr = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 419,423 ---- }, wxCalendarDateAttr = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 425,429 **** }, wxCalendarDateBorder = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "enum", IsNumber = true, --- 425,429 ---- }, wxCalendarDateBorder = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "enum", IsNumber = true, *************** *** 432,436 **** wxCalendarEvent = { BaseClass = "wxDateEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 432,436 ---- wxCalendarEvent = { BaseClass = "wxDateEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 438,442 **** }, wxCalendarHitTestResult = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "enum", IsNumber = true, --- 438,442 ---- }, wxCalendarHitTestResult = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "enum", IsNumber = true, *************** *** 695,699 **** wxDateEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 695,699 ---- wxDateEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 702,706 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl", DefType = "class", IsNumber = false, --- 702,706 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL", DefType = "class", IsNumber = false, *************** *** 708,712 **** }, wxDateSpan = { ! Condition = "wxLUA_USE_wxDateSpan", DefType = "class", IsNumber = false, --- 708,712 ---- }, wxDateSpan = { ! Condition = "wxLUA_USE_wxDateSpan && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 714,718 **** }, wxDateTime = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "class", IsNumber = false, --- 714,718 ---- }, wxDateTime = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 720,724 **** }, ["wxDateTime::Calendar"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 720,724 ---- }, ["wxDateTime::Calendar"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 726,730 **** }, ["wxDateTime::Country"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 726,730 ---- }, ["wxDateTime::Country"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 732,736 **** }, ["wxDateTime::Month"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 732,736 ---- }, ["wxDateTime::Month"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 738,742 **** }, ["wxDateTime::TZ"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 738,742 ---- }, ["wxDateTime::TZ"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 744,748 **** }, ["wxDateTime::WeekDay"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 744,748 ---- }, ["wxDateTime::WeekDay"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 750,754 **** }, wxDateTimeArray = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "class", IsNumber = false, --- 750,754 ---- }, wxDateTimeArray = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 756,760 **** }, wxDateTimeHolidayAuthority = { ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", DefType = "class", IsNumber = false, --- 756,760 ---- }, wxDateTimeHolidayAuthority = { ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 763,767 **** wxDateTimeWorkDays = { BaseClass = "wxDateTimeHolidayAuthority", ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", DefType = "class", IsNumber = false, --- 763,767 ---- wxDateTimeWorkDays = { BaseClass = "wxDateTimeHolidayAuthority", ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 2881,2885 **** }, wxTimeSpan = { ! Condition = "wxLUA_USE_wxTimeSpan", DefType = "class", IsNumber = false, --- 2881,2885 ---- }, wxTimeSpan = { ! Condition = "wxLUA_USE_wxTimeSpan && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 2888,2892 **** wxTimer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxTimer", DefType = "class", IsNumber = false, --- 2888,2892 ---- wxTimer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER", DefType = "class", IsNumber = false, *************** *** 2895,2899 **** wxTimerEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxTimer", DefType = "class", IsNumber = false, --- 2895,2899 ---- wxTimerEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER", DefType = "class", IsNumber = false, |