gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Remove disabled by default SDL1 support.

Browse Source 
Refs #2041.

This was SVN commit r17470.
This commit is contained in:
fabio
2015-12-14 10:52:21 +00:00
parent 7665a9ee31
commit 9a2d0f803e
21 changed files with 16 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/scripting/GuiScriptConversions.cpp
-22
View File
@@ -34,13 +34,7 @@ template<> void ScriptInterface::ToJSVal<SDL_Event_>(JSContext* cx, JS::MutableH
switch (val.ev.type)
{
#if SDL_VERSION_ATLEAST(2, 0, 0)
case SDL_WINDOWEVENT: typeName = "windowevent"; break;
#else
case SDL_ACTIVEEVENT: typeName = "activeevent"; break;
case SDL_VIDEOEXPOSE: typeName = "videoexpose"; break;
case SDL_VIDEORESIZE: typeName = "videoresize"; break;
#endif
case SDL_KEYDOWN: typeName = "keydown"; break;
case SDL_KEYUP: typeName = "keyup"; break;
case SDL_MOUSEMOTION: typeName = "mousemotion"; break;
@@ -63,14 +57,6 @@ template<> void ScriptInterface::ToJSVal<SDL_Event_>(JSContext* cx, JS::MutableH
switch (val.ev.type)
{
#if !SDL_VERSION_ATLEAST(2, 0, 0)
case SDL_ACTIVEEVENT:
{
SET(obj, "gain", (int)val.ev.active.gain);
SET(obj, "state", (int)val.ev.active.state);
break;
}
#endif
case SDL_KEYDOWN:
case SDL_KEYUP:
{
@@ -89,14 +75,6 @@ template<> void ScriptInterface::ToJSVal<SDL_Event_>(JSContext* cx, JS::MutableH
// SET(keysym, "scancode", (int)val.ev.key.keysym.scancode); // (not in wsdl.h)
SET(keysym, "sym", (int)val.ev.key.keysym.sym);
// SET(keysym, "mod", (int)val.ev.key.keysym.mod); // (not in wsdl.h)
#if !SDL_VERSION_ATLEAST(2, 0, 0)
if (val.ev.key.keysym.unicode)
{
std::wstring unicode(1, (wchar_t)val.ev.key.keysym.unicode);
SET(keysym, "unicode", unicode);
}
else
#endif
{
SET(keysym, "unicode", JS::UndefinedHandleValue);
}