From: John L. <jr...@us...> - 2007-01-18 17:19:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/wxLua/modules/wxbind/src Modified Files: datetime.cpp file.cpp wx_bind.cpp Log Message: updated wxUSE_XXX ifdefs for date time Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** wx_bind.cpp 19 Dec 2006 06:18:03 -0000 1.71 --- wx_bind.cpp 18 Jan 2007 17:19:02 -0000 1.72 *************** *** 195,199 **** #endif // wxCHECK_VERSION(2,5,0) ! #if wxLUA_USE_wxCalendarCtrl { &wxEVT_CALENDAR_DAY_CHANGED, "wxEVT_CALENDAR_DAY_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_CALENDAR_DOUBLECLICKED, "wxEVT_CALENDAR_DOUBLECLICKED", &s_wxluatag_wxCalendarEvent }, --- 195,199 ---- #endif // wxCHECK_VERSION(2,5,0) ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL { &wxEVT_CALENDAR_DAY_CHANGED, "wxEVT_CALENDAR_DAY_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_CALENDAR_DOUBLECLICKED, "wxEVT_CALENDAR_DOUBLECLICKED", &s_wxluatag_wxCalendarEvent }, *************** *** 203,207 **** { &wxEVT_CALENDAR_YEAR_CHANGED, "wxEVT_CALENDAR_YEAR_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_DATE_CHANGED, "wxEVT_DATE_CHANGED", &s_wxluatag_wxDateEvent }, ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxDragDrop --- 203,207 ---- { &wxEVT_CALENDAR_YEAR_CHANGED, "wxEVT_CALENDAR_YEAR_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_DATE_CHANGED, "wxEVT_DATE_CHANGED", &s_wxluatag_wxDateEvent }, ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxDragDrop *************** *** 300,306 **** #endif // wxLUA_USE_wxTaskBarIcon ! #if wxLUA_USE_wxTimer { &wxEVT_TIMER, "wxEVT_TIMER", &s_wxluatag_wxTimerEvent }, ! #endif // wxLUA_USE_wxTimer #if wxLUA_USE_wxTreeCtrl --- 300,306 ---- #endif // wxLUA_USE_wxTaskBarIcon ! #if wxLUA_USE_wxTimer && wxUSE_TIMER { &wxEVT_TIMER, "wxEVT_TIMER", &s_wxluatag_wxTimerEvent }, ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER #if wxLUA_USE_wxTreeCtrl *************** *** 1135,1142 **** #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimer { "wxTIMER_CONTINUOUS", wxTIMER_CONTINUOUS }, { "wxTIMER_ONE_SHOT", wxTIMER_ONE_SHOT }, ! #endif // wxLUA_USE_wxTimer #if wxLUA_USE_wxToolbar --- 1135,1142 ---- #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimer && wxUSE_TIMER { "wxTIMER_CONTINUOUS", wxTIMER_CONTINUOUS }, { "wxTIMER_ONE_SHOT", wxTIMER_ONE_SHOT }, ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER #if wxLUA_USE_wxToolbar *************** *** 1618,1622 **** #endif // wxLUA_USE_wxAcceleratorTable ! #if wxLUA_USE_wxCalendarCtrl { "wxCAL_BORDER_NONE", wxCAL_BORDER_NONE }, { "wxCAL_BORDER_ROUND", wxCAL_BORDER_ROUND }, --- 1618,1622 ---- #endif // wxLUA_USE_wxAcceleratorTable ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL { "wxCAL_BORDER_NONE", wxCAL_BORDER_NONE }, { "wxCAL_BORDER_ROUND", wxCAL_BORDER_ROUND }, *************** *** 1635,1639 **** { "wxCAL_SHOW_SURROUNDING_WEEKS", wxCAL_SHOW_SURROUNDING_WEEKS }, { "wxCAL_SUNDAY_FIRST", wxCAL_SUNDAY_FIRST }, ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxCheckBox --- 1635,1639 ---- { "wxCAL_SHOW_SURROUNDING_WEEKS", wxCAL_SHOW_SURROUNDING_WEEKS }, { "wxCAL_SUNDAY_FIRST", wxCAL_SUNDAY_FIRST }, ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxCheckBox *************** *** 1739,1743 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, --- 1739,1743 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, *************** *** 1745,1751 **** { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // wxLUA_USE_wxDatePickerCtrl ! #if wxLUA_USE_wxDateTime { "wxDateTime_ADT", wxDateTime::ADT }, { "wxDateTime_AKDT", wxDateTime::AKDT }, --- 1745,1751 ---- { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { "wxDateTime_ADT", wxDateTime::ADT }, { "wxDateTime_AKDT", wxDateTime::AKDT }, *************** *** 1833,1837 **** { "wxDateTime_WET", wxDateTime::WET }, { "wxDateTime_Wed", wxDateTime::Wed }, ! #endif // wxLUA_USE_wxDateTime #if wxLUA_USE_wxDragDrop --- 1833,1837 ---- { "wxDateTime_WET", wxDateTime::WET }, { "wxDateTime_Wed", wxDateTime::Wed }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDragDrop *************** *** 2702,2708 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDateTime { &wxDefaultDateTime, 0, "wxDefaultDateTime", &s_wxluatag_wxDateTime }, ! #endif // wxLUA_USE_wxDateTime #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 2702,2708 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { &wxDefaultDateTime, 0, "wxDefaultDateTime", &s_wxluatag_wxDateTime }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY *************** *** 3027,3031 **** #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange[] = { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTimeArray, 0 }; --- 3027,3031 ---- #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange[] = { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTimeArray, 0 }; *************** *** 3065,3069 **** } ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) #if (wxLUA_USE_wxFont) && (wxLUA_USE_wxSystemSettings) --- 3065,3069 ---- } ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) #if (wxLUA_USE_wxFont) && (wxLUA_USE_wxSystemSettings) *************** *** 4552,4556 **** #endif // wxLUA_USE_wxCursor ! #if wxLUA_USE_wxDateTime static wxLuaArgTag s_wxluatagArray_wxLua_function_wxFileModificationTime[] = { &s_wxluaarg_String, 0 }; --- 4552,4556 ---- #endif // wxLUA_USE_wxCursor ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME static wxLuaArgTag s_wxluatagArray_wxLua_function_wxFileModificationTime[] = { &s_wxluaarg_String, 0 }; *************** *** 4573,4579 **** } ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority[] = { &s_wxluatag_wxDateTimeHolidayAuthority, 0 }; --- 4573,4579 ---- } ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority[] = { &s_wxluatag_wxDateTimeHolidayAuthority, 0 }; *************** *** 4601,4605 **** } ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 4601,4605 ---- } ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY *************** *** 5169,5176 **** ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) { LuaGlobal, "wxDateTimeHolidayAuthority_GetHolidaysInRange", wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange, 3, 3, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange }, { LuaGlobal, "wxDateTimeHolidayAuthority_IsHoliday", wxLua_wxDateTimeHolidayAuthority_IsHoliday, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_IsHoliday }, ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) --- 5169,5176 ---- ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) { LuaGlobal, "wxDateTimeHolidayAuthority_GetHolidaysInRange", wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange, 3, 3, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange }, { LuaGlobal, "wxDateTimeHolidayAuthority_IsHoliday", wxLua_wxDateTimeHolidayAuthority_IsHoliday, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_IsHoliday }, ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) *************** *** 5316,5328 **** ! #if wxLUA_USE_wxDateTime { LuaGlobal, "wxFileModificationTime", wxLua_function_wxFileModificationTime, 1, 1, s_wxluatagArray_wxLua_function_wxFileModificationTime }, ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority { LuaGlobal, "wxDateTimeHolidayAuthority_AddAuthority", wxLua_wxDateTimeHolidayAuthority_AddAuthority, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority }, { LuaGlobal, "wxDateTimeHolidayAuthority_ClearAllAuthorities", wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities, 0, 0, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority --- 5316,5328 ---- ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { LuaGlobal, "wxFileModificationTime", wxLua_function_wxFileModificationTime, 1, 1, s_wxluatagArray_wxLua_function_wxFileModificationTime }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME { LuaGlobal, "wxDateTimeHolidayAuthority_AddAuthority", wxLua_wxDateTimeHolidayAuthority_AddAuthority, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority }, { LuaGlobal, "wxDateTimeHolidayAuthority_ClearAllAuthorities", wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities, 0, 0, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME *************** *** 5679,5688 **** ! #if wxLUA_USE_wxCalendarCtrl { "wxCalendarCtrl", wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, -1, CLASSINFO(wxCalendarCtrl), &s_wxluatag_wxCalendarCtrl, "wxControl" }, { "wxCalendarDateAttr", wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, -1, NULL, &s_wxluatag_wxCalendarDateAttr, NULL }, { "wxCalendarEvent", wxCalendarEvent_methods, wxCalendarEvent_methodCount, -1, CLASSINFO(wxCalendarEvent), &s_wxluatag_wxCalendarEvent, "wxDateEvent" }, { "wxDateEvent", wxDateEvent_methods, wxDateEvent_methodCount, -1, CLASSINFO(wxDateEvent), &s_wxluatag_wxDateEvent, "wxCommandEvent" }, ! #endif // wxLUA_USE_wxCalendarCtrl --- 5679,5688 ---- ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL { "wxCalendarCtrl", wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, -1, CLASSINFO(wxCalendarCtrl), &s_wxluatag_wxCalendarCtrl, "wxControl" }, { "wxCalendarDateAttr", wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, -1, NULL, &s_wxluatag_wxCalendarDateAttr, NULL }, { "wxCalendarEvent", wxCalendarEvent_methods, wxCalendarEvent_methodCount, -1, CLASSINFO(wxCalendarEvent), &s_wxluatag_wxCalendarEvent, "wxDateEvent" }, { "wxDateEvent", wxDateEvent_methods, wxDateEvent_methodCount, -1, CLASSINFO(wxDateEvent), &s_wxluatag_wxDateEvent, "wxCommandEvent" }, ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL *************** *** 5778,5801 **** ! #if wxLUA_USE_wxDatePickerCtrl { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, -1, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl" }, ! #endif // wxLUA_USE_wxDatePickerCtrl ! #if wxLUA_USE_wxDateSpan { "wxDateSpan", wxDateSpan_methods, wxDateSpan_methodCount, -1, NULL, &s_wxluatag_wxDateSpan, NULL }, ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime { "wxDateTime", wxDateTime_methods, wxDateTime_methodCount, -1, NULL, &s_wxluatag_wxDateTime, NULL }, { "wxDateTimeArray", wxDateTimeArray_methods, wxDateTimeArray_methodCount, -1, NULL, &s_wxluatag_wxDateTimeArray, NULL }, ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority { "wxDateTimeHolidayAuthority", wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, -1, NULL, &s_wxluatag_wxDateTimeHolidayAuthority, NULL }, { "wxDateTimeWorkDays", wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, -1, NULL, &s_wxluatag_wxDateTimeWorkDays, "wxDateTimeHolidayAuthority" }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority --- 5778,5801 ---- ! #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, -1, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl" }, ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME { "wxDateSpan", wxDateSpan_methods, wxDateSpan_methodCount, -1, NULL, &s_wxluatag_wxDateSpan, NULL }, ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { "wxDateTime", wxDateTime_methods, wxDateTime_methodCount, -1, NULL, &s_wxluatag_wxDateTime, NULL }, { "wxDateTimeArray", wxDateTimeArray_methods, wxDateTimeArray_methodCount, -1, NULL, &s_wxluatag_wxDateTimeArray, NULL }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME { "wxDateTimeHolidayAuthority", wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, -1, NULL, &s_wxluatag_wxDateTimeHolidayAuthority, NULL }, { "wxDateTimeWorkDays", wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, -1, NULL, &s_wxluatag_wxDateTimeWorkDays, "wxDateTimeHolidayAuthority" }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME *************** *** 6211,6223 **** ! #if wxLUA_USE_wxTimeSpan { "wxTimeSpan", wxTimeSpan_methods, wxTimeSpan_methodCount, -1, NULL, &s_wxluatag_wxTimeSpan, NULL }, ! #endif // wxLUA_USE_wxTimeSpan ! #if wxLUA_USE_wxTimer { "wxTimer", wxTimer_methods, wxTimer_methodCount, -1, CLASSINFO(wxTimer), &s_wxluatag_wxTimer, "wxObject" }, { "wxTimerEvent", wxTimerEvent_methods, wxTimerEvent_methodCount, -1, CLASSINFO(wxTimerEvent), &s_wxluatag_wxTimerEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxTimer --- 6211,6223 ---- ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME { "wxTimeSpan", wxTimeSpan_methods, wxTimeSpan_methodCount, -1, NULL, &s_wxluatag_wxTimeSpan, NULL }, ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxTimer && wxUSE_TIMER { "wxTimer", wxTimer_methods, wxTimer_methodCount, -1, CLASSINFO(wxTimer), &s_wxluatag_wxTimer, "wxObject" }, { "wxTimerEvent", wxTimerEvent_methods, wxTimerEvent_methodCount, -1, CLASSINFO(wxTimerEvent), &s_wxluatag_wxTimerEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER *************** *** 6528,6534 **** ! #if wxLUA_USE_wxCalendarCtrl wxLUA_IMPLEMENT_ENCAPSULATION(wxCalendarDateAttr, wxCalendarDateAttr) ! #endif // wxLUA_USE_wxCalendarCtrl --- 6528,6534 ---- ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL wxLUA_IMPLEMENT_ENCAPSULATION(wxCalendarDateAttr, wxCalendarDateAttr) ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL *************** *** 6563,6581 **** ! #if wxLUA_USE_wxDateSpan wxLUA_IMPLEMENT_ENCAPSULATION(wxDateSpan, wxDateSpan) ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTime, wxDateTime) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeArray, wxDateTimeArray) ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeWorkDays, wxDateTimeWorkDays) ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority --- 6563,6581 ---- ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxDateSpan, wxDateSpan) ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTime, wxDateTime) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeArray, wxDateTimeArray) ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeWorkDays, wxDateTimeWorkDays) ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME *************** *** 6650,6656 **** ! #if wxLUA_USE_wxTimeSpan wxLUA_IMPLEMENT_ENCAPSULATION(wxTimeSpan, wxTimeSpan) ! #endif // wxLUA_USE_wxTimeSpan --- 6650,6656 ---- ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxTimeSpan, wxTimeSpan) ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** file.cpp 17 Dec 2006 07:47:15 -0000 1.25 --- file.cpp 18 Jan 2007 17:19:02 -0000 1.26 *************** *** 57,61 **** ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetModificationTime[] = { 0 }; // wxDateTime GetModificationTime() const --- 57,61 ---- ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetModificationTime[] = { 0 }; // wxDateTime GetModificationTime() const *************** *** 127,131 **** } ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) --- 127,131 ---- } ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) *************** *** 1530,1538 **** ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) { LuaMethod, "GetModificationTime", wxLua_wxFileName_GetModificationTime, 0, 0, s_wxluatagArray_wxLua_wxFileName_GetModificationTime }, { LuaMethod, "GetTimes", wxLua_wxFileName_GetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_GetTimes }, { LuaMethod, "SetTimes", wxLua_wxFileName_SetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_SetTimes }, ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) --- 1530,1538 ---- ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) { LuaMethod, "GetModificationTime", wxLua_wxFileName_GetModificationTime, 0, 0, s_wxluatagArray_wxLua_wxFileName_GetModificationTime }, { LuaMethod, "GetTimes", wxLua_wxFileName_GetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_GetTimes }, { LuaMethod, "SetTimes", wxLua_wxFileName_SetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_SetTimes }, ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** datetime.cpp 17 Dec 2006 07:47:14 -0000 1.22 --- datetime.cpp 18 Jan 2007 17:19:02 -0000 1.23 *************** *** 27,31 **** ! #if wxLUA_USE_wxDateTime // ------------------------------------------------------------------------------------------------- // Bind class wxDateTime --- 27,31 ---- ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME // ------------------------------------------------------------------------------------------------- [...992 lines suppressed...] ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { LuaMethod, "GetRange", wxLua_wxDatePickerCtrl_GetRange, 2, 2, s_wxluatagArray_wxLua_wxDatePickerCtrl_GetRange }, { LuaMethod, "GetValue", wxLua_wxDatePickerCtrl_GetValue, 0, 0, s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue }, { LuaMethod, "SetRange", wxLua_wxDatePickerCtrl_SetRange, 2, 2, s_wxluatagArray_wxLua_wxDatePickerCtrl_SetRange }, { LuaMethod, "SetValue", wxLua_wxDatePickerCtrl_SetValue, 1, 1, s_wxluatagArray_wxLua_wxDatePickerCtrl_SetValue }, ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { LuaDelete, "wxDatePickerCtrl", wxLua_wxDatePickerCtrl_destructor, 0, 0, s_wxluaargArray_None }, *************** *** 4694,4697 **** int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxDatePickerCtrl_methods[0]); ! #endif // wxLUA_USE_wxDatePickerCtrl --- 4702,4705 ---- int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxDatePickerCtrl_methods[0]); ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL |