From: John L. <jr...@us...> - 2006-11-02 23:38:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxbind.h 1 Nov 2006 23:44:46 -0000 1.39 --- wxbind.h 2 Nov 2006 23:38:08 -0000 1.40 *************** *** 291,294 **** --- 291,298 ---- #endif // wxLUA_USE_wxDir + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #include "wx/display.h" + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop #include "wx/dnd.h" *************** *** 913,916 **** --- 917,921 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClientDC; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDC; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDCClipper; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMemoryDC; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMirrorDC; *************** *** 940,945 **** --- 945,956 ---- #if wxLUA_USE_wxDateTime extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTime; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeArray; #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeHolidayAuthority; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeWorkDays; + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + #if wxLUA_USE_wxDialog extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDialog; *************** *** 954,957 **** --- 965,974 ---- #endif // wxLUA_USE_wxDirDialog + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxArrayVideoModes; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDisplay; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxVideoMode; + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDropFilesEvent; *************** *** 1847,1850 **** --- 1864,1869 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDC_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDC_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDCClipper_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDCClipper_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMemoryDC_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxMemoryDC_methodCount; *************** *** 1889,1894 **** --- 1908,1922 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTime_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTime_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTimeArray_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeArray_methodCount; #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTimeHolidayAuthority_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeHolidayAuthority_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTimeWorkDays_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeWorkDays_methodCount; + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + #if wxLUA_USE_wxDialog extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDialog_methods; *************** *** 1906,1909 **** --- 1934,1946 ---- #endif // wxLUA_USE_wxDirDialog + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxArrayVideoModes_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxArrayVideoModes_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDisplay_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDisplay_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxVideoMode_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxVideoMode_methodCount; + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDropFilesEvent_methods; *************** *** 2610,2613 **** --- 2647,2654 ---- #endif // wxLUA_USE_wxCriticalSectionLocker + #if wxLUA_USE_wxDC + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDCClipper, wxDCClipper) + #endif // wxLUA_USE_wxDC + #if wxLUA_USE_wxDataObject wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBitmapDataObject, wxBitmapDataObject) *************** *** 2625,2634 **** --- 2666,2687 ---- #if wxLUA_USE_wxDateTime wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTime, wxDateTime) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeArray, wxDateTimeArray) #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeWorkDays, wxDateTimeWorkDays) + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + #if wxLUA_USE_wxDir wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDir, wxDir) #endif // wxLUA_USE_wxDir + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxArrayVideoModes, wxArrayVideoModes) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDisplay, wxDisplay) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxVideoMode, wxVideoMode) + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDropSource, wxDropSource) |