forked from 0ad/0ad
gcc fixes
This was SVN commit r694.
This commit is contained in:
parent
b780be8bde
commit
073a683e56
@ -29,10 +29,8 @@ gee@pyro.nu
|
||||
#include <stdarg.h>
|
||||
|
||||
// namespaces used
|
||||
//XERCES_CPP_NAMESPACE_USE
|
||||
using namespace std;
|
||||
|
||||
#include "sysdep/ia32.h"
|
||||
#include "ps/CLogger.h"
|
||||
#define XERO_TIME
|
||||
|
||||
|
@ -135,7 +135,7 @@ class IGUIObject
|
||||
friend class IGUIScrollBar;
|
||||
|
||||
// Allow getProperty to access things like GetParent()
|
||||
friend JSI_IGUIObject::getProperty(JSContext* cx, JSObject* obj, jsval id, jsval* vp);
|
||||
friend JSBool JSI_IGUIObject::getProperty(JSContext* cx, JSObject* obj, jsval id, jsval* vp);
|
||||
|
||||
public:
|
||||
IGUIObject();
|
||||
|
@ -1,4 +1,4 @@
|
||||
// $Id: JSInterface_IGUIObject.cpp,v 1.1 2004/07/08 15:19:45 philip Exp $
|
||||
// $Id: JSInterface_IGUIObject.cpp,v 1.2 2004/07/10 21:23:06 philip Exp $
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
@ -244,7 +244,7 @@ JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsval id, jsval
|
||||
jsval t; int32 s;
|
||||
#define PROP(x) JS_GetProperty(cx, obj, #x, &t); \
|
||||
JS_ValueToInt32(cx, t, &s); \
|
||||
area.pixel.##x = s
|
||||
area.pixel.x = s
|
||||
PROP(left); PROP(top); PROP(right); PROP(bottom);
|
||||
#undef PROP
|
||||
|
||||
@ -270,7 +270,7 @@ JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsval id, jsval
|
||||
jsval t; double s;
|
||||
#define PROP(x) JS_GetProperty(cx, obj, #x, &t); \
|
||||
JS_ValueToNumber(cx, t, &s); \
|
||||
colour.##x = (float)s
|
||||
colour.x = (float)s
|
||||
PROP(r); PROP(g); PROP(b); PROP(a);
|
||||
#undef PROP
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
// $Id: JSInterface_IGUIObject.h,v 1.1 2004/07/08 15:19:45 philip Exp $
|
||||
// $Id: JSInterface_IGUIObject.h,v 1.2 2004/07/10 21:23:06 philip Exp $
|
||||
|
||||
#include "scripting/ScriptingHost.h"
|
||||
#include "gui/GUI.h"
|
||||
|
Loading…
Reference in New Issue
Block a user