Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/modules/wxbind/include
Modified Files:
wxbind.h
Log Message:
Fix compilation in MSW, add includes, etc
Change genwxbind.lua to preserve the order of conditions, fifo instead of filo
not sure why it reversed the order before, but it doesn't seem right.
Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** wxbind.h 18 Jun 2007 02:56:26 -0000 1.76
--- wxbind.h 18 Jun 2007 14:54:59 -0000 1.77
***************
*** 72,82 ****
// ---------------------------------------------------------------------------
! #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
! #include "wx/generic/helpext.h"
! #endif // (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)
!
! #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar)
! #include "wx/tbarsmpl.h"
! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar)
[...1444 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)
--- 2677,2680 ----
***************
*** 2668,2677 ****
#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)
--- 2735,2738 ----
|