[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.41,1.42

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17631/wxLua/modules/wxbind/include

Modified Files:
	wxbind.h 
Log Message:
use defined(WXCOMAP_XXX) && WX_COMPAT_XXX not just #if WX_COMPAT
better colours for wxluasudoku


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wxbind.h	6 Nov 2006 06:11:44 -0000	1.41
--- wxbind.h	22 Nov 2006 06:08:33 -0000	1.42
***************
*** 630,636 ****
  #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog;
! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
  
  #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
--- 630,636 ----
  #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog;
! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
  
  #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
***************
*** 1454,1461 ****
  #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLog_methods;
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount;
! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
  
  #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)
--- 1454,1461 ----
  #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP)
  
! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLog_methods;
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount;
! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)
  
  #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)