Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.77,1.78
|
From: John L. <jr...@us...> - 2007-06-18 19:52:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21463/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Add more classes from 2.8, wxStandardPaths, wxToolbook, wxTreebook... Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** wxbind.h 18 Jun 2007 14:54:59 -0000 1.77 --- wxbind.h 18 Jun 2007 19:51:29 -0000 1.78 *************** *** 101,104 **** --- 101,110 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxUSE_NUMBERDLG) + #if (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) + #include "wx/html/htmlcell.h" + #include "wx/html/htmlwin.h" + #include "wx/htmllbox.h" + #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) + #if (wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) #include "wx/bmpbuttn.h" *************** *** 130,134 **** #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! #include "wx/htmllbox.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) --- 136,140 ---- #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! #include "wx/html/htmlcell.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) *************** *** 203,206 **** --- 209,213 ---- #include "wx/process.h" #include "wx/timer.h" + #include "wx/tokenzr.h" #include "wx/utils.h" #include "wxlua/include/wxlua_bind.h" *************** *** 226,242 **** --- 233,268 ---- #include "wx/dcscreen.h" #include "wx/event.h" + #include "wx/html/htmlcell.h" + #include "wx/html/htmltag.h" #include "wx/html/htmprint.h" #include "wx/pen.h" #include "wx/power.h" + #include "wx/wxhtml.h" #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #include "wx/stdpaths.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog #include "wx/aboutdlg.h" #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + #include "wx/hyperlink.h" + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + #if wxCHECK_VERSION(2,8,0) && wxUSE_TGA #include "wx/imagxpm.h" #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TGA + #if wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + #include "wx/toolbook.h" + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + #if wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + #include "wx/treebook.h" + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 #include "wx/animate.h" *************** *** 453,458 **** #if wxLUA_USE_wxHTML && wxUSE_HTML #include "wx/html/htmlcell.h" - #include "wx/html/htmltag.h" - #include "wx/wxhtml.h" #endif // wxLUA_USE_wxHTML && wxUSE_HTML --- 479,482 ---- *************** *** 818,821 **** --- 842,859 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAutoBufferedPaintDC_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxAutoBufferedPaintDC_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlCellEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlCellEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlCellEvent_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlFontCell; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlFontCell_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlFontCell_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindowInterface; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindowInterface_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_methodCount; + extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxHtmlWindowInterface_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_enumCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHtmlListBox; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSimpleHtmlListBox_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHtmlListBox_methodCount; #endif // (wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0)) *************** *** 895,906 **** #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindowInterface; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindowInterface_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_methodCount; ! extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxHtmlWindowInterface_enums[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_enumCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHtmlListBox; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSimpleHtmlListBox_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHtmlListBox_methodCount; #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) --- 933,939 ---- #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlColourCell; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlColourCell_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlColourCell_methodCount; #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxCHECK_VERSION(2,8,0)) *************** *** 1226,1229 **** --- 1259,1265 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStringClientData_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxStringClientData_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStringTokenizer; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStringTokenizer_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStringTokenizer_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSysColourChangedEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSysColourChangedEvent_methods[]; *************** *** 1321,1327 **** --- 1357,1378 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlEasyPrinting_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlEasyPrinting_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlLinkInfo; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlLinkInfo_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlLinkInfo_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlParser; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlParser_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlParser_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlPrintout; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlPrintout_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlPrintout_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlTag; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlTag_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlTag_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWinParser; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWinParser_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWinParser_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindow; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindow_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindow_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMemoryDC; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxMemoryDC_methods[]; *************** *** 1350,1353 **** --- 1401,1412 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStandardPaths; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStandardPaths_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStandardPaths_methodCount; + extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxStandardPaths_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStandardPaths_enumCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAboutDialogInfo; *************** *** 1356,1359 **** --- 1415,1427 ---- #endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog + #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHyperlinkCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHyperlinkCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHyperlinkCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHyperlinkEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHyperlinkEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHyperlinkEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl + #if wxCHECK_VERSION(2,8,0) && wxUSE_TGA extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxXPMHandler; *************** *** 1362,1365 **** --- 1430,1451 ---- #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TGA + #if wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolbook; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxToolbook_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolbook_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolbookEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxToolbookEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxToolbookEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TOOLBOOK && wxLUA_USE_wxToolbook + + #if wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTreebook; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxTreebook_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxTreebook_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTreebookEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxTreebookEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxTreebookEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook + #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; *************** *** 1885,1906 **** extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlContainerCell_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlContainerCell_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlLinkInfo; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlLinkInfo_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlLinkInfo_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlParser; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlParser_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlParser_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlTag; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlTag_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlTag_methodCount; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWidgetCell; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWidgetCell_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWidgetCell_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWinParser; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWinParser_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWinParser_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindow; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHtmlWindow_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindow_methodCount; #endif // wxLUA_USE_wxHTML && wxUSE_HTML --- 1971,1977 ---- *************** *** 2623,2626 **** --- 2694,2701 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxStandardPaths, wxStandardPaths) + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxAboutDialogInfo, wxAboutDialogInfo) |
