wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

gcc fixes

Browse Source 
This was SVN commit r694.
This commit is contained in:
Ykkrosh 2004-07-10 21:23:06 +00:00
parent b780be8bde
commit 073a683e56
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gui/CGUI.cpp
View File

@ -29,10 +29,8 @@ gee@pyro.nu
#include <stdarg.h> #include <stdarg.h>
// namespaces used // namespaces used
//XERCES_CPP_NAMESPACE_USE
using namespace std; using namespace std;
#include "sysdep/ia32.h"
#include "ps/CLogger.h" #include "ps/CLogger.h"
#define XERO_TIME #define XERO_TIME

2
source/gui/IGUIObject.h
View File

@ -135,7 +135,7 @@ class IGUIObject
friend class IGUIScrollBar; friend class IGUIScrollBar;
// Allow getProperty to access things like GetParent() // 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: public:
IGUIObject(); IGUIObject();

6
source/gui/scripting/JSInterface_IGUIObject.cpp
View File

@ -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" #include "precompiled.h"
@ -244,7 +244,7 @@ JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsval id, jsval
jsval t; int32 s; jsval t; int32 s;
#define PROP(x) JS_GetProperty(cx, obj, #x, &t); \ #define PROP(x) JS_GetProperty(cx, obj, #x, &t); \
JS_ValueToInt32(cx, t, &s); \ JS_ValueToInt32(cx, t, &s); \
area.pixel.##x = s area.pixel.x = s
PROP(left); PROP(top); PROP(right); PROP(bottom); PROP(left); PROP(top); PROP(right); PROP(bottom);
#undef PROP #undef PROP
@ -270,7 +270,7 @@ JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsval id, jsval
jsval t; double s; jsval t; double s;
#define PROP(x) JS_GetProperty(cx, obj, #x, &t); \ #define PROP(x) JS_GetProperty(cx, obj, #x, &t); \
JS_ValueToNumber(cx, t, &s); \ JS_ValueToNumber(cx, t, &s); \
colour.##x = (float)s colour.x = (float)s
PROP(r); PROP(g); PROP(b); PROP(a); PROP(r); PROP(g); PROP(b); PROP(a);
#undef PROP #undef PROP

2
source/gui/scripting/JSInterface_IGUIObject.h
View File

@ -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 "scripting/ScriptingHost.h"
#include "gui/GUI.h" #include "gui/GUI.h"