From d621f6cea3db01b41d657d00eb4f3b31269cf45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Thu, 26 Sep 2013 17:46:26 -0300 Subject: [PATCH] Added UintPtr and IntPtr. Changed cUIControl::mData to UintPtr. Updated SOIL2. --- include/eepp/declares.hpp | 2 ++ include/eepp/ui/cuicontrol.hpp | 4 ++-- src/eepp/ui/cuicontrol.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/eepp/declares.hpp b/include/eepp/declares.hpp index 498a3eecc..22717e36e 100644 --- a/include/eepp/declares.hpp +++ b/include/eepp/declares.hpp @@ -255,6 +255,8 @@ namespace EE { typedef double eeDouble; //! The internal double floating point. It's only used when the engine needs some very high precision floating point ( for example the timer ) typedef unsigned int eeUint; typedef signed int eeInt; + typedef SOPHIST_intptr IntPtr; + typedef SOPHIST_uintptr UintPtr; #if SOPHIST_has_64 typedef SOPHIST_uint64 Uint64; diff --git a/include/eepp/ui/cuicontrol.hpp b/include/eepp/ui/cuicontrol.hpp index 3870bbe27..16913cc36 100644 --- a/include/eepp/ui/cuicontrol.hpp +++ b/include/eepp/ui/cuicontrol.hpp @@ -146,9 +146,9 @@ class EE_API cUIControl { cUIControl * NextGetLoop() const; - void Data( const Uint32& data ); + void Data( const UintPtr& data ); - const Uint32& Data() const; + const UintPtr& Data() const; cUIControl * ChildGetAt( eeVector2i CtrlPos, eeUint RecursiveLevel = 0 ); diff --git a/src/eepp/ui/cuicontrol.cpp b/src/eepp/ui/cuicontrol.cpp index 1df4f41b5..6c27cb247 100644 --- a/src/eepp/ui/cuicontrol.cpp +++ b/src/eepp/ui/cuicontrol.cpp @@ -447,11 +447,11 @@ cUIControl * cUIControl::NextGetLoop() const { return mNext; } -void cUIControl::Data( const Uint32& data ) { +void cUIControl::Data(const UintPtr& data ) { mData = data; } -const Uint32& cUIControl::Data() const { +const UintPtr& cUIControl::Data() const { return mData; }