[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.50,1.51

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

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

Modified Files:
	wxbind.h 
Log Message:
change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to &


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** wxbind.h	18 Jan 2007 17:19:01 -0000	1.50
--- wxbind.h	22 Feb 2007 20:33:08 -0000	1.51
***************
*** 377,384 ****
  #endif // wxLUA_USE_wxImageList
  
! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
      #include "wx/event.h"
      #include "wx/joystick.h"
! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
  
  #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))
--- 377,384 ----
  #endif // wxLUA_USE_wxImageList
  
! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
      #include "wx/event.h"
      #include "wx/joystick.h"
! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
  
  #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))
***************
*** 1084,1091 ****
  #endif // wxLUA_USE_wxImageList
  
! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystick;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystickEvent;
! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
  
  #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))
--- 1084,1091 ----
  #endif // wxLUA_USE_wxImageList
  
! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystick;
      extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystickEvent;
! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
  
  #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))
***************
*** 2110,2119 ****
  #endif // wxLUA_USE_wxImageList
  
! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystick_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystick_methodCount;
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystickEvent_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystickEvent_methodCount;
! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK
  
  #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))
--- 2110,2119 ----
  #endif // wxLUA_USE_wxImageList
  
! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystick_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystick_methodCount;
      extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystickEvent_methods[];
      extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystickEvent_methodCount;
! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
  
  #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))