diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-22 19:36:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-10-23 08:04:49 +0200 |
| commit | e8205f38c611cfc97ca0e32c911b3d373a94d230 (patch) | |
| tree | 6de16fd72ef3f7c71471a5b3e5dd3913778d43c6 /toolkit | |
| parent | b883dd8a32b1b58910272ec4791aeb241914932e (diff) | |
Change SystemParentData::aWindow to sal_uIntPtr
...with similar reasoning as in 5d422c0348efd1df6b3d44dd6efcf5c5490fc321 "Revert
'sal_uIntPtr->unsigned long in SystemEnvData'": Prior to
3aef606f2758172a27718a06fea0ff9080e4d80f "use tools::Long in vcl" this was long,
but besides X11 window resource IDs (for whose appropriate type see the commit
message of 5d422c0348efd1df6b3d44dd6efcf5c5490fc321), at least
vcl/unx/gtk3/gtk3gtkframe.cxx uses it in combination with GdkNativeWindow (e.g.,
GtkSalFrame::m_aForeignParentWindow and GtkSalFrame::findTopLevelSystemWindow),
which itself is a typedef for sal_uIntPtr (vcl/inc/unx/gtk/gtkframe.hxx).
Change-Id: I6d26ca7056da413d948215682425ee1ddb622326
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104695
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 8b0cbe1320b3..9a78589ded58 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -84,7 +84,7 @@ void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle ) #elif defined( IOS ) // Nothing #elif defined( UNX ) - aSysParentData.aWindow = static_cast<long>(nHandle); + aSysParentData.aWindow = nHandle; aSysParentData.bXEmbedSupport = bXEmbed; #endif |