Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wave.cpp, 1.24, 1.25 wx_bind.cpp, 1.76, 1.77
|
From: John L. <jr...@us...> - 2007-02-22 20:33:13
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10499/wxLua/modules/wxbind/src Modified Files: wave.cpp wx_bind.cpp Log Message: change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to & Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** wx_bind.cpp 22 Feb 2007 05:40:53 -0000 1.76 --- wx_bind.cpp 22 Feb 2007 20:33:09 -0000 1.77 *************** *** 229,238 **** #endif // wxLUA_USE_wxGrid ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { &wxEVT_JOY_BUTTON_DOWN, "wxEVT_JOY_BUTTON_DOWN", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_BUTTON_UP, "wxEVT_JOY_BUTTON_UP", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_MOVE, "wxEVT_JOY_MOVE", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_ZMOVE, "wxEVT_JOY_ZMOVE", &s_wxluatag_wxJoystickEvent }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxLuaHtmlWindow --- 229,238 ---- #endif // wxLUA_USE_wxGrid ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { &wxEVT_JOY_BUTTON_DOWN, "wxEVT_JOY_BUTTON_DOWN", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_BUTTON_UP, "wxEVT_JOY_BUTTON_UP", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_MOVE, "wxEVT_JOY_MOVE", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_ZMOVE, "wxEVT_JOY_ZMOVE", &s_wxluatag_wxJoystickEvent }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxLuaHtmlWindow *************** *** 2041,2045 **** #endif // wxLUA_USE_wxImage ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { "wxJOYSTICK1", wxJOYSTICK1 }, { "wxJOYSTICK2", wxJOYSTICK2 }, --- 2041,2045 ---- #endif // wxLUA_USE_wxImage ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { "wxJOYSTICK1", wxJOYSTICK1 }, { "wxJOYSTICK2", wxJOYSTICK2 }, *************** *** 2049,2053 **** { "wxJOY_BUTTON4", wxJOY_BUTTON4 }, { "wxJOY_BUTTON_ANY", wxJOY_BUTTON_ANY }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) --- 2049,2053 ---- { "wxJOY_BUTTON4", wxJOY_BUTTON4 }, { "wxJOY_BUTTON_ANY", wxJOY_BUTTON_ANY }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) *************** *** 4648,4652 **** #endif // wxLUA_USE_wxFrame ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK // %static int GetNumberJoysticks() const --- 4648,4652 ---- #endif // wxLUA_USE_wxFrame ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK // %static int GetNumberJoysticks() const *************** *** 4663,4667 **** } ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxObject --- 4663,4667 ---- } ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxObject *************** *** 5308,5314 **** ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { LuaGlobal, "wxJoystick_GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK --- 5308,5314 ---- ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { LuaGlobal, "wxJoystick_GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK *************** *** 5926,5933 **** ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { "wxJoystick", wxJoystick_methods, wxJoystick_methodCount, -1, CLASSINFO(wxJoystick), &s_wxluatag_wxJoystick, "wxObject" }, { "wxJoystickEvent", wxJoystickEvent_methods, wxJoystickEvent_methodCount, -1, CLASSINFO(wxJoystickEvent), &s_wxluatag_wxJoystickEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK --- 5926,5933 ---- ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { "wxJoystick", wxJoystick_methods, wxJoystick_methodCount, -1, CLASSINFO(wxJoystick), &s_wxluatag_wxJoystick, "wxObject" }, { "wxJoystickEvent", wxJoystickEvent_methods, wxJoystickEvent_methodCount, -1, CLASSINFO(wxJoystickEvent), &s_wxluatag_wxJoystickEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK Index: wave.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wave.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wave.cpp 22 Feb 2007 05:40:53 -0000 1.24 --- wave.cpp 22 Feb 2007 20:33:09 -0000 1.25 *************** *** 821,825 **** ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystick --- 821,825 ---- ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystick *************** *** 830,834 **** ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystick_GetPosition(lua_State *L) --- 830,834 ---- ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystick_GetPosition(lua_State *L) *************** *** 849,853 **** } ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystick_constructor[] = { &s_wxluaarg_Number, 0 }; --- 849,853 ---- } ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystick_constructor[] = { &s_wxluaarg_Number, 0 }; *************** *** 1491,1497 **** WXLUAMETHOD wxJoystick_methods[] = { ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystick_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystick", wxLua_wxJoystick_constructor, 1, 0, s_wxluatagArray_wxLua_wxJoystick_constructor }, --- 1491,1497 ---- WXLUAMETHOD wxJoystick_methods[] = { ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystick_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystick", wxLua_wxJoystick_constructor, 1, 0, s_wxluatagArray_wxLua_wxJoystick_constructor }, *************** *** 1540,1547 **** int wxJoystick_methodCount = sizeof(wxJoystick_methods)/sizeof(wxJoystick_methods[0]); ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystickEvent --- 1540,1547 ---- int wxJoystick_methodCount = sizeof(wxJoystick_methods)/sizeof(wxJoystick_methods[0]); ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystickEvent *************** *** 1552,1556 **** ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystickEvent_GetPosition(lua_State *L) --- 1552,1556 ---- ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystickEvent_GetPosition(lua_State *L) *************** *** 1571,1575 **** } ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystickEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; --- 1571,1575 ---- } ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystickEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; *************** *** 1794,1800 **** WXLUAMETHOD wxJoystickEvent_methods[] = { ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystickEvent_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystickEvent", wxLua_wxJoystickEvent_constructor, 4, 0, s_wxluatagArray_wxLua_wxJoystickEvent_constructor }, --- 1794,1800 ---- WXLUAMETHOD wxJoystickEvent_methods[] = { ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystickEvent_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystickEvent", wxLua_wxJoystickEvent_constructor, 4, 0, s_wxluatagArray_wxLua_wxJoystickEvent_constructor }, *************** *** 1814,1817 **** int wxJoystickEvent_methodCount = sizeof(wxJoystickEvent_methods)/sizeof(wxJoystickEvent_methods[0]); ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK --- 1814,1817 ---- int wxJoystickEvent_methodCount = sizeof(wxJoystickEvent_methods)/sizeof(wxJoystickEvent_methods[0]); ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK |
