From: John L. <jr...@us...> - 2009-10-01 04:21:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4255/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h Log Message: Removed %encapsulate and %noclassinfo tags for %classes in the bindings. No longer encapsulating non wxObjects in a wxObject class for deletion. We now provide delete functions for each class in the wxLuaBindClass structs to be called on the void* we get from Lua. Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxadv_bind.h 25 Sep 2009 18:47:57 -0000 1.20 --- wxadv_bind.h 1 Oct 2009 04:21:01 -0000 1.21 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 205,245 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - - #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxAboutDialogInfo, wxAboutDialogInfo) - #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog - - #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxCalendarDateAttr, wxCalendarDateAttr) - #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL - - #if wxLUA_USE_wxGrid && wxUSE_GRID - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellAttr, wxGridCellAttr) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellAttrProvider, wxGridCellAttrProvider) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellAutoWrapStringEditor, wxGridCellAutoWrapStringEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellAutoWrapStringRenderer, wxGridCellAutoWrapStringRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellBoolEditor, wxGridCellBoolEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellBoolRenderer, wxGridCellBoolRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellChoiceEditor, wxGridCellChoiceEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellCoords, wxGridCellCoords) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellCoordsArray, wxGridCellCoordsArray) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellDateTimeRenderer, wxGridCellDateTimeRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellEditor, wxGridCellEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellEnumEditor, wxGridCellEnumEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellEnumRenderer, wxGridCellEnumRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellFloatEditor, wxGridCellFloatEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellFloatRenderer, wxGridCellFloatRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellNumberEditor, wxGridCellNumberEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellNumberRenderer, wxGridCellNumberRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellRenderer, wxGridCellRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellStringRenderer, wxGridCellStringRenderer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellTextEditor, wxGridCellTextEditor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridCellWorker, wxGridCellWorker) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXADV, wxGridTableMessage, wxGridTableMessage) - #endif // wxLUA_USE_wxGrid && wxUSE_GRID - #endif // __HOOK_WXLUA_wxadv_H__ --- 205,208 ---- Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxcore_bind.h 25 Sep 2009 18:47:57 -0000 1.21 --- wxcore_bind.h 1 Oct 2009 04:21:01 -0000 1.22 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 1145,1149 **** extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxToolBar; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxToolBarBase; - extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxToolBarTool; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxToolBarToolBase; #endif // wxLUA_USE_wxToolbar --- 1145,1148 ---- *************** *** 1202,1349 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - - #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxStockGDI, wxStockGDI) - #endif // (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) - - #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxCHECK_VERSION(2,8,0)) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxURLDataObject, wxURLDataObject) - #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxCHECK_VERSION(2,8,0)) - - #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxLogWindow, wxLogWindow) - #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) - - #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxLogTextCtrl, wxLogTextCtrl) - #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) - - #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxLogGui, wxLogGui) - #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) - - #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxGBPosition, wxGBPosition) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxGBSpan, wxGBSpan) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxSizerFlags, wxSizerFlags) - #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) - - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxPropagateOnce, wxPropagateOnce) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxPropagationDisabler, wxPropagationDisabler) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxVisualAttributes, wxVisualAttributes) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxWindowDisabler, wxWindowDisabler) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxWindowUpdateLocker, wxWindowUpdateLocker) - - #if wxCHECK_VERSION(2,8,0) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxMouseState, wxMouseState) - #endif // wxCHECK_VERSION(2,8,0) - - #if wxLUA_USE_Geometry && wxUSE_GEOMETRY - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxPoint2DDouble, wxPoint2DDouble) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxPoint2DInt, wxPoint2DInt) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxRect2DDouble, wxRect2DDouble) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxRect2DInt, wxRect2DInt) - #endif // wxLUA_USE_Geometry && wxUSE_GEOMETRY - - #if wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxAcceleratorEntry, wxAcceleratorEntry) - #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL - - #if wxLUA_USE_wxBusyCursor - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxBusyCursor, wxBusyCursor) - #endif // wxLUA_USE_wxBusyCursor - - #if wxLUA_USE_wxCaret && wxUSE_CARET - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxCaret, wxCaret) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxCaretSuspend, wxCaretSuspend) - #endif // wxLUA_USE_wxCaret && wxUSE_CARET - - #if wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxClipboardLocker, wxClipboardLocker) - #endif // wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD - - #if wxLUA_USE_wxColourPenBrush - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxColourDatabase, wxColourDatabase) - #endif // wxLUA_USE_wxColourPenBrush - - #if wxLUA_USE_wxDC - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxDCClipper, wxDCClipper) - #endif // wxLUA_USE_wxDC - - #if wxLUA_USE_wxDataObject && wxUSE_DATAOBJ - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxBitmapDataObject, wxBitmapDataObject) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxDataFormat, wxDataFormat) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxDataObjectComposite, wxDataObjectComposite) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxDataObjectSimple, wxDataObjectSimple) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxFileDataObject, wxFileDataObject) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxTextDataObject, wxTextDataObject) - #endif // wxLUA_USE_wxDataObject && wxUSE_DATAOBJ - - #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxArrayVideoModes, wxArrayVideoModes) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxDisplay, wxDisplay) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxVideoMode, wxVideoMode) - #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY - - #if wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxDropSource, wxDropSource) - #endif // wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP - - #if wxLUA_USE_wxFont - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxNativeFontInfo, wxNativeFontInfo) - #endif // wxLUA_USE_wxFont - - #if wxLUA_USE_wxFontEnumerator - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxFontEnumerator, wxFontEnumerator) - #endif // wxLUA_USE_wxFontEnumerator - - #if wxLUA_USE_wxHelpController && wxUSE_HELP - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxHelpControllerHelpProvider, wxHelpControllerHelpProvider) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxHelpProvider, wxHelpProvider) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxSimpleHelpProvider, wxSimpleHelpProvider) - #endif // wxLUA_USE_wxHelpController && wxUSE_HELP - - #if wxLUA_USE_wxIcon - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxIconBundle, wxIconBundle) - #endif // wxLUA_USE_wxIcon - - #if wxLUA_USE_wxImage && wxUSE_IMAGE - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxImageHistogram, wxImageHistogram) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxImageHistogram::iterator, wxImageHistogram_iterator) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxImageHistogramEntry, wxImageHistogramEntry) - #endif // wxLUA_USE_wxImage && wxUSE_IMAGE - - #if wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxListItemAttr, wxListItemAttr) - #endif // wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL - - #if wxLUA_USE_wxPointSizeRect - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxPoint, wxPoint) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxRect, wxRect) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxSize, wxSize) - #endif // wxLUA_USE_wxPointSizeRect - - #if wxLUA_USE_wxProcess - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxProcess, wxProcess) - #endif // wxLUA_USE_wxProcess - - #if wxLUA_USE_wxRenderer - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxHeaderButtonParams, wxHeaderButtonParams) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxRendererNative, wxRendererNative) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxRendererVersion, wxRendererVersion) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxSplitterRenderParams, wxSplitterRenderParams) - #endif // wxLUA_USE_wxRenderer - - #if wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxTextAttr, wxTextAttr) - #endif // wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL - - #if wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXCORE, wxTreeItemId, wxTreeItemId) - #endif // wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL - #endif // __HOOK_WXLUA_wxcore_H__ --- 1201,1204 ---- Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxrichtext_bind.h 25 Sep 2009 18:47:57 -0000 1.18 --- wxrichtext_bind.h 1 Oct 2009 04:21:01 -0000 1.19 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 49,56 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxrichtext_H__ --- 49,52 ---- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxxrc_bind.h 25 Sep 2009 18:47:57 -0000 1.18 --- wxxrc_bind.h 1 Oct 2009 04:21:01 -0000 1.19 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 57,64 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxxrc_H__ --- 57,60 ---- Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxnet_bind.h 25 Sep 2009 18:47:57 -0000 1.18 --- wxnet_bind.h 1 Oct 2009 04:21:01 -0000 1.19 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 97,104 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxnet_H__ --- 97,100 ---- Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxbase_bind.h 25 Sep 2009 18:47:57 -0000 1.19 --- wxbase_bind.h 1 Oct 2009 04:21:01 -0000 1.20 *************** *** 11,14 **** --- 11,28 ---- #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" + + // ---------------------------------------------------------------------------- + // Convert from wxWidgets wxT('') to wxT(""), a string. Copied from wx/filefn.h + + // platform independent versions + #if defined(__UNIX__) && !defined(__OS2__) + // CYGWIN also uses UNIX settings + #define wxLua_FILE_SEP_PATH wxT("/") + #elif defined(__MAC__) + #define wxLua_FILE_SEP_PATH wxT(":") + #else // Windows and OS/2 + #define wxLua_FILE_SEP_PATH wxT("\\") + #endif // Unix/Windows + #include "wxlua/include/wxlstate.h" *************** *** 19,25 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 33,39 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 312,426 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDynamicLibrary, wxDynamicLibrary) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDynamicLibraryDetails, wxDynamicLibraryDetails) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDynamicLibraryDetailsArray, wxDynamicLibraryDetailsArray) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileType, wxFileType) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileType::MessageParameters, wxFileType_MessageParameters) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileTypeInfo, wxFileTypeInfo) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxIconLocation, wxIconLocation) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxMimeTypesManager, wxMimeTypesManager) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxPathList, wxPathList) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxString, wxString) - - #if wxLUA_USE_wxArrayInt - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxArrayInt, wxArrayInt) - #endif // wxLUA_USE_wxArrayInt - - #if wxLUA_USE_wxArrayString - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxArrayString, wxArrayString) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxSortedArrayString, wxSortedArrayString) - #endif // wxLUA_USE_wxArrayString - - #if wxLUA_USE_wxConfig && wxUSE_CONFIG - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxConfig, wxConfig) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxConfigBase, wxConfigBase) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxConfigPathChanger, wxConfigPathChanger) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileConfig, wxFileConfig) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxMemoryConfig, wxMemoryConfig) - #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG - - #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxCriticalSection, wxCriticalSection) - #endif // wxLUA_USE_wxCriticalSection && wxUSE_THREADS - - #if wxLUA_USE_wxCriticalSectionLocker - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxCriticalSectionLocker, wxCriticalSectionLocker) - #endif // wxLUA_USE_wxCriticalSectionLocker - - #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDateSpan, wxDateSpan) - #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME - - #if wxLUA_USE_wxDateTime && wxUSE_DATETIME - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDateTime, wxDateTime) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDateTimeArray, wxDateTimeArray) - #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME - - #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDateTimeWorkDays, wxDateTimeWorkDays) - #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME - - #if wxLUA_USE_wxDir - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDir, wxDir) - #endif // wxLUA_USE_wxDir - - #if wxLUA_USE_wxFile && wxUSE_FILE - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFile, wxFile) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxTempFile, wxTempFile) - #endif // wxLUA_USE_wxFile && wxUSE_FILE - - #if wxLUA_USE_wxFileName - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileName, wxFileName) - #endif // wxLUA_USE_wxFileName - - #if wxLUA_USE_wxLog && wxUSE_LOG - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLog, wxLog) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLogBuffer, wxLogBuffer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLogChain, wxLogChain) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLogNull, wxLogNull) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLogPassThrough, wxLogPassThrough) - #endif // wxLUA_USE_wxLog && wxUSE_LOG - - #if wxLUA_USE_wxRegEx && wxUSE_REGEX - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxRegEx, wxRegEx) - #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX - - #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxStopWatch, wxStopWatch) - #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH - - #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxTimeSpan, wxTimeSpan) - #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME - - #if wxUSE_INTL - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLanguageInfo, wxLanguageInfo) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLocale, wxLocale) - #endif // wxUSE_INTL - - #if wxUSE_LONGLONG - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxLongLong, wxLongLong) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxULongLong, wxULongLong) - #endif // wxUSE_LONGLONG - - #if wxUSE_SNGLINST_CHECKER - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxSingleInstanceChecker, wxSingleInstanceChecker) - #endif // wxUSE_SNGLINST_CHECKER - - #if wxUSE_STREAMS - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDataInputStream, wxDataInputStream) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxDataOutputStream, wxDataOutputStream) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileInputStream, wxFileInputStream) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileOutputStream, wxFileOutputStream) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxInputStream, wxInputStream) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxMemoryInputStream, wxMemoryInputStream) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxOutputStream, wxOutputStream) - #endif // wxUSE_STREAMS - #endif // __HOOK_WXLUA_wxbase_H__ --- 326,329 ---- Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxmedia_bind.h 25 Sep 2009 18:47:57 -0000 1.18 --- wxmedia_bind.h 1 Oct 2009 04:21:01 -0000 1.19 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 59,66 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxmedia_H__ --- 59,62 ---- Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxgl_bind.h 25 Sep 2009 18:47:57 -0000 1.18 --- wxgl_bind.h 1 Oct 2009 04:21:01 -0000 1.19 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 58,65 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxgl_H__ --- 58,61 ---- Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxstc_bind.h 25 Sep 2009 18:47:57 -0000 1.18 --- wxstc_bind.h 1 Oct 2009 04:21:01 -0000 1.19 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 54,61 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxstc_H__ --- 54,57 ---- Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxaui_bind.h 25 Sep 2009 18:47:57 -0000 1.19 --- wxaui_bind.h 1 Oct 2009 04:21:01 -0000 1.20 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 78,101 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - - #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiDefaultDockArt, wxAuiDefaultDockArt) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiDefaultTabArt, wxAuiDefaultTabArt) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiDockArt, wxAuiDockArt) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiDockInfo, wxAuiDockInfo) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiDockUIPart, wxAuiDockUIPart) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiNotebookPage, wxAuiNotebookPage) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiNotebookPageArray, wxAuiNotebookPageArray) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiPaneButton, wxAuiPaneButton) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiPaneInfo, wxAuiPaneInfo) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiPaneInfoArray, wxAuiPaneInfoArray) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiSimpleTabArt, wxAuiSimpleTabArt) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiTabArt, wxAuiTabArt) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXAUI, wxAuiTabContainerButton, wxAuiTabContainerButton) - #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI - #endif // __HOOK_WXLUA_wxaui_H__ --- 78,81 ---- Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxhtml_bind.h 25 Sep 2009 18:47:57 -0000 1.19 --- wxhtml_bind.h 1 Oct 2009 04:21:01 -0000 1.20 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 103,110 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxhtml_H__ --- 103,106 ---- Index: wxxml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxxml_bind.h 25 Sep 2009 18:47:57 -0000 1.18 --- wxxml_bind.h 1 Oct 2009 04:21:01 -0000 1.19 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 59,71 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - - #if wxLUA_USE_wxXML && wxUSE_XML - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXXML, wxXmlNode, wxXmlNode) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXXML, wxXmlProperty, wxXmlProperty) - #endif // wxLUA_USE_wxXML && wxUSE_XML - #endif // __HOOK_WXLUA_wxxml_H__ --- 59,62 ---- |