diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-13 12:18:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-14 07:18:36 +0100 |
| commit | c0f1d211eff5f89f5c9298743f6e7d91d187b799 (patch) | |
| tree | 6ccd526d6de0183eea880fe56097319ebfe09328 | |
| parent | b4940db58257de07797abaf51d087ae040b9c9ef (diff) | |
sal_uIntPtr->unsigned long in SystemEnvData
to match the type used by X11
Change-Id: I5fe043e33602be21c84b81780c89df751c3bc96c
Reviewed-on: https://gerrit.libreoffice.org/46393
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/vcl/sysdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/syschild.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index e427e3a1b435..794f424b4448 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -64,7 +64,7 @@ struct SystemEnvData // Nothing #elif defined( UNX ) void* pDisplay; // the relevant display connection - sal_uIntPtr aWindow; // the window of the object + unsigned long aWindow; // the window of the object void* pSalFrame; // contains a salframe, if object has one void* pWidget; // the corresponding widget void* pVisual; // the visual in use diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 8424f82937d6..3be9ffe7ca6b 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -184,7 +184,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle() #elif defined IOS // Nothing #elif defined UNX - nRet = (sal_IntPtr) GetSystemData()->aWindow; + nRet = GetSystemData()->aWindow; #endif return nRet; |