[patch] Fixes Squirrel Bindings on x86_64

code-blocks-x64-patch.patch (text/plain), 3.62 KB, created by Dan Kozlowski on 2007-01-14 19:11:37 UTC

Index: src/sdk/scripting/sqplus/SquirrelObject.h
===================================================================
--- src/sdk/scripting/sqplus/SquirrelObject.h	(revision 3483)
+++ src/sdk/scripting/sqplus/SquirrelObject.h	(working copy)
@@ -11,7 +11,7 @@
 	SquirrelObject(HSQOBJECT o);
 	SquirrelObject & operator =(const SquirrelObject &o);
 	SquirrelObject & operator =(int n);
-	void AttachToStackObject(int idx);
+	void AttachToStackObject(SQInteger idx);
   void Reset(void); // Release (any) reference and reset _o.
   SquirrelObject Clone();
 	BOOL SetValue(const SquirrelObject &key,const SquirrelObject &val);
@@ -102,21 +102,21 @@
 		_top = sq_gettop(v);
 		this->v = v;
 	}
-	SQFloat GetFloat(int idx) {
+	SQFloat GetFloat(SQInteger idx) {
 		SQFloat x = 0.0f;
 		if(idx > 0 && idx <= _top) {
 			sq_getfloat(v,idx,&x);
 		}
 		return x;
 	}
-	SQInteger GetInt(int idx) {
+	SQInteger GetInt(SQInteger idx) {
 		SQInteger x = 0;
 		if(idx > 0 && idx <= _top) {
 			sq_getinteger(v,idx,&x);
 		}
 		return x;
 	}
-	HSQOBJECT GetObjectHandle(int idx) {
+	HSQOBJECT GetObjectHandle(SQInteger idx) {
 		HSQOBJECT x;
 		if(idx > 0 && idx <= _top) {
 			sq_resetobject(&x);
@@ -124,7 +124,7 @@
 		}
 		return x;
 	}
-	const SQChar *GetString(int idx)
+	const SQChar *GetString(SQInteger idx)
 	{
     const SQChar *x = NULL;
 		if(idx > 0 && idx <= _top) {
@@ -132,7 +132,7 @@
 		}
 		return x;
 	}
-	SQUserPointer GetUserPointer(int idx)
+	SQUserPointer GetUserPointer(SQInteger idx)
 	{
 		SQUserPointer x = 0;
 		if(idx > 0 && idx <= _top) {
@@ -140,14 +140,14 @@
 		}
 		return x;
 	}
-	SQUserPointer GetInstanceUp(int idx,SQUserPointer tag)
+	SQUserPointer GetInstanceUp(SQInteger idx,SQUserPointer tag)
 	{
 		SQUserPointer self;
 		if(SQ_FAILED(sq_getinstanceup(v,idx,(SQUserPointer*)&self,tag)))
 			return NULL;
 		return self;
 	}
-	SQUserPointer GetUserData(int idx,SQUserPointer tag=0)
+	SQUserPointer GetUserData(SQInteger idx,SQUserPointer tag=0)
 	{
 		SQUserPointer otag;
 		SQUserPointer up;
@@ -159,7 +159,7 @@
 		}
 		return NULL;
 	}
-	BOOL GetBool(int idx)
+	BOOL GetBool(SQInteger idx)
 	{
 		SQBool ret;
 		if(idx > 0 && idx <= _top) {
@@ -168,7 +168,7 @@
 		}
 		return FALSE;
 	}
-	int GetType(int idx)
+	int GetType(SQInteger idx)
 	{
 		if(idx > 0 && idx <= _top) {
 			return sq_gettype(v,idx);
Index: src/sdk/scripting/sqplus/SquirrelObject.cpp
===================================================================
--- src/sdk/scripting/sqplus/SquirrelObject.cpp	(revision 3483)
+++ src/sdk/scripting/sqplus/SquirrelObject.cpp	(working copy)
@@ -71,7 +71,7 @@
 	}
 }
 
-void SquirrelObject::AttachToStackObject(int idx)
+void SquirrelObject::AttachToStackObject(SQInteger idx)
 {
 	HSQOBJECT t;
 	sq_getstackobj(SquirrelVM::_VM,idx,&t);
Index: src/sdk/scripting/bindings/sc_dialog.cpp
===================================================================
--- src/sdk/scripting/bindings/sc_dialog.cpp	(revision 3483)
+++ src/sdk/scripting/bindings/sc_dialog.cpp	(working copy)
@@ -98,7 +98,7 @@
         if (!s_ActiveDialog)
         {
             cbMessageBox(_("XRCID() only valid while inside a ShowDialog() call..."), _("Error"), wxICON_ERROR);
-            return sa.Return(-1);
+            return sa.Return((SQInteger)-1);
         }
         
         wxWindow* win = 0;
@@ -106,7 +106,7 @@
             win = wxWindow::FindWindowByName(cbC2U(sa.GetString(2)), s_ActiveDialog);
         else
             win = wxWindow::FindWindowByName(*SqPlus::GetInstance<wxString>(v, 2), s_ActiveDialog);
-        return sa.Return(win ? win->GetId() : -1);
+        return sa.Return(win ? (SQInteger)win->GetId() : (SQInteger)-1);
     }
 
     void Register_Dialog()