[Wxlua-commit] wxLua/bindings/wxwidgets wave.i, 1.11, 1.12 wx_datatypes.lua, 1.47, 1.48

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10499/wxLua/bindings/wxwidgets

Modified Files:
	wave.i wx_datatypes.lua 
Log Message:
change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to &


Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wave.i	13 Dec 2006 00:27:56 -0000	1.11
--- wave.i	22 Feb 2007 20:33:08 -0000	1.12
***************
*** 128,132 ****
  //  wxJoystick
  
! %if wxLUA_USE_wxJoystick|wxUSE_JOYSTICK
  
  %include "wx/joystick.h"
--- 128,132 ----
  //  wxJoystick
  
! %if wxLUA_USE_wxJoystick & wxUSE_JOYSTICK
  
  %include "wx/joystick.h"
***************
*** 216,219 ****
  %endclass
  
! %endif //wxLUA_USE_wxJoystick|wxUSE_JOYSTICK
  
--- 216,219 ----
  %endclass
  
! %endif //wxLUA_USE_wxJoystick & wxUSE_JOYSTICK
  

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** wx_datatypes.lua	9 Feb 2007 05:17:08 -0000	1.47
--- wx_datatypes.lua	22 Feb 2007 20:33:08 -0000	1.48
***************
*** 1697,1701 ****
    wxJoystick = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,
--- 1697,1701 ----
    wxJoystick = {
      BaseClass = "wxObject",
!     Condition = "wxLUA_USE_wxJoystick && wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,
***************
*** 1704,1708 ****
    wxJoystickEvent = {
      BaseClass = "wxEvent",
!     Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,
--- 1704,1708 ----
    wxJoystickEvent = {
      BaseClass = "wxEvent",
!     Condition = "wxLUA_USE_wxJoystick && wxUSE_JOYSTICK",
      DefType = "class",
      IsNumber = false,