Under the hoods, HWND is a typedef to a void *, which is can't be stored
in the int in 64 bits systems.
Change-Id: I580170eaabf6508abc8bbca7395da98233164d9b
#include <stdint.h>\r
#include <dali/public-api/signals/callback.h>\r
\r
#include <stdint.h>\r
#include <dali/public-api/signals/callback.h>\r
\r
-typedef uint64_t WinWindowHandle;\r
+typedef uintptr_t WinWindowHandle;\r
typedef uint64_t WinPixmap;\r
\r
namespace Dali\r
typedef uint64_t WinPixmap;\r
\r
namespace Dali\r
void WindowBaseWin::Initialize( PositionSize positionSize, Any surface, bool isTransparent )
{
// see if there is a surface in Any surface
void WindowBaseWin::Initialize( PositionSize positionSize, Any surface, bool isTransparent )
{
// see if there is a surface in Any surface
- unsigned int surfaceId = GetSurfaceId( surface );
+ uintptr_t surfaceId = GetSurfaceId( surface );
// if the surface is empty, create a new one.
if( surfaceId == 0 )
// if the surface is empty, create a new one.
if( surfaceId == 0 )
-unsigned int WindowBaseWin::GetSurfaceId( Any surface ) const
+uintptr_t WindowBaseWin::GetSurfaceId( Any surface ) const
- unsigned int surfaceId = 0;
+ uintptr_t surfaceId = 0;
if ( surface.Empty() == false )
{
if ( surface.Empty() == false )
{
DALI_ASSERT_ALWAYS( mWin32Window != 0 && "There is no Windows window" );
}
DALI_ASSERT_ALWAYS( mWin32Window != 0 && "There is no Windows window" );
}
-void WindowBaseWin::SetWinWindow( unsigned int surfaceId )
+void WindowBaseWin::SetWinWindow( uintptr_t surfaceId )
{
HWND hWnd = (HWND)surfaceId;
mWin32Window = static_cast<WinWindowHandle>(surfaceId);
{
HWND hWnd = (HWND)surfaceId;
mWin32Window = static_cast<WinWindowHandle>(surfaceId);
- mWindowImpl.SetHWND( reinterpret_cast<uint64_t>(hWnd));
+ mWindowImpl.SetHWND(surfaceId);
mWindowImpl.SetWinProc();
}
mWindowImpl.SetWinProc();
}
* @param surface Any containing a surface id, or can be empty
* @return surface id, or zero if surface is empty
*/
* @param surface Any containing a surface id, or can be empty
* @return surface id, or zero if surface is empty
*/
- unsigned int GetSurfaceId( Any surface ) const;
+ uintptr_t GetSurfaceId( Any surface ) const;
/**
* @brief Create window
/**
* @brief Create window
/**
* @brief Sets up an already created window.
*/
/**
* @brief Sets up an already created window.
*/
- void SetWinWindow( unsigned int surfaceId );
+ void SetWinWindow( uintptr_t surfaceId );