From: John L. <jr...@us...> - 2007-06-18 21:41:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** wxbind.h 18 Jun 2007 19:51:29 -0000 1.78 --- wxbind.h 18 Jun 2007 21:40:35 -0000 1.79 *************** *** 72,96 **** // --------------------------------------------------------------------------- - #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) - #include "wx/html/helpctrl.h" - #include "wx/html/helpdata.h" - #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) - #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) #include "wx/xrc/xml.h" #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxXMLResource && wxUSE_XML) [...1344 lines suppressed...] + #if wxLUA_USE_wxDC + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDCClipper, wxDCClipper) + #endif // wxLUA_USE_wxDC + #if wxLUA_USE_wxDataObject && wxUSE_DATAOBJ wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBitmapDataObject, wxBitmapDataObject) *************** *** 2810,2813 **** --- 2746,2755 ---- #endif // wxLUA_USE_wxGrid && wxUSE_GRID + #if wxLUA_USE_wxHelpController && wxUSE_HELP + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpControllerHelpProvider, wxHelpControllerHelpProvider) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpProvider, wxHelpProvider) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSimpleHelpProvider, wxSimpleHelpProvider) + #endif // wxLUA_USE_wxHelpController && wxUSE_HELP + #if wxLUA_USE_wxIcon wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconBundle, wxIconBundle) |