From: John L. <jr...@us...> - 2007-03-12 23:13:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22784/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: update bindings to wxWidgets 2.8 using headers Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wxbind.h 9 Mar 2007 06:10:17 -0000 1.57 --- wxbind.h 12 Mar 2007 23:12:34 -0000 1.58 *************** *** 108,111 **** --- 108,115 ---- #endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #include "wx/htmllbox.h" + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) #include "wx/event.h" *************** *** 365,368 **** --- 369,373 ---- #if wxLUA_USE_wxFont #include "wx/font.h" + #include "wx/fontutil.h" #endif // wxLUA_USE_wxFont *************** *** 412,415 **** --- 417,425 ---- #endif // wxLUA_USE_wxHelpController && wxUSE_HELP + #if wxLUA_USE_wxIcon + #include "wx/iconbndl.h" + #include "wx/iconloc.h" + #endif // wxLUA_USE_wxIcon + #if wxLUA_USE_wxImage && wxUSE_IMAGE #include "wx/imagbmp.h" *************** *** 695,698 **** --- 705,709 ---- #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindowInterface; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHtmlListBox; #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) *************** *** 701,704 **** --- 712,719 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStockGDI; + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAutoBufferedPaintDC; *************** *** 851,854 **** --- 866,870 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPaletteChangedEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPanel; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPathList; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcessEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPropagateOnce; *************** *** 1080,1083 **** --- 1096,1100 ---- #if wxLUA_USE_wxFile && wxUSE_FILE extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFile; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTempFile; #endif // wxLUA_USE_wxFile && wxUSE_FILE *************** *** 1096,1099 **** --- 1113,1117 ---- #if wxLUA_USE_wxFont extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFont; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNativeFontInfo; #endif // wxLUA_USE_wxFont *************** *** 1187,1190 **** --- 1205,1209 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIcon; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIconBundle; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIconLocation; #endif // wxLUA_USE_wxIcon *************** *** 1581,1584 **** --- 1600,1605 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHtmlWindowInterface_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSimpleHtmlListBox_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHtmlListBox_methodCount; #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) *************** *** 1588,1591 **** --- 1609,1617 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxStockGDI_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStockGDI_methodCount; + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxAutoBufferedPaintDC_methods[]; *************** *** 1801,1804 **** --- 1827,1832 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPanel_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxPanel_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPathList_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPathList_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxProcessEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcessEvent_methodCount; *************** *** 2137,2140 **** --- 2165,2170 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFile_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxFile_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTempFile_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxTempFile_methodCount; #endif // wxLUA_USE_wxFile && wxUSE_FILE *************** *** 2157,2160 **** --- 2187,2192 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFont_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxFont_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxNativeFontInfo_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxNativeFontInfo_methodCount; #endif // wxLUA_USE_wxFont *************** *** 2303,2306 **** --- 2335,2340 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxIconBundle_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxIconBundle_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxIconLocation_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxIconLocation_methodCount; #endif // wxLUA_USE_wxIcon *************** *** 2797,2804 **** --- 2831,2843 ---- // --------------------------------------------------------------------------- + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxStockGDI, wxStockGDI) + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxURLDataObject, wxURLDataObject) #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPathList, wxPathList) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagateOnce, wxPropagateOnce) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPropagationDisabler, wxPropagationDisabler) *************** *** 2906,2909 **** --- 2945,2949 ---- #if wxLUA_USE_wxFile && wxUSE_FILE wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFile, wxFile) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTempFile, wxTempFile) #endif // wxLUA_USE_wxFile && wxUSE_FILE *************** *** 2912,2915 **** --- 2952,2959 ---- #endif // wxLUA_USE_wxFileName + #if wxLUA_USE_wxFont + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxNativeFontInfo, wxNativeFontInfo) + #endif // wxLUA_USE_wxFont + #if wxLUA_USE_wxFontEnumerator wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFontEnumerator, wxFontEnumerator) *************** *** 2928,2931 **** --- 2972,2976 ---- #if wxLUA_USE_wxIcon wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconBundle, wxIconBundle) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconLocation, wxIconLocation) #endif // wxLUA_USE_wxIcon |