diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-01-26 11:29:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-27 10:15:29 +0100 |
| commit | 7d506f6bb45725bff9d5a6ddf0893d826f992596 (patch) | |
| tree | e0e56a18d40273ca587f20a6b02a2b9c6092fcb2 /vcl | |
| parent | f318b856ed055f1952276355f811153f6b29c93e (diff) | |
drop unused GDK_WINDOW_XWINDOW define
and expand out gdk_window_foreign_new_for_display macro
Change-Id: I4e29c16bda98f5b7eb44d91345b9f987631281cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109944
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index b5614d9934ca..ab4ea230bcf8 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -52,9 +52,6 @@ class GtkSalGraphics; class GtkSalDisplay; typedef sal_uIntPtr GdkNativeWindow; -#define GDK_WINDOW_XWINDOW(o) GDK_WINDOW_XID(o) -#define gdk_set_sm_client_id(i) gdk_x11_set_sm_client_id(i) -#define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b) class GtkDropTarget; class GtkDragSource; class GtkDnDTransferable; diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 2fac782ac349..771cc0538581 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1192,7 +1192,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData ) m_aForeignParentWindow = pSysData->aWindow; m_pForeignParent = nullptr; m_aForeignTopLevelWindow = findTopLevelSystemWindow(pSysData->aWindow); - m_pForeignTopLevel = gdk_window_foreign_new_for_display( getGdkDisplay(), m_aForeignTopLevelWindow ); + m_pForeignTopLevel = gdk_x11_window_foreign_new_for_display( getGdkDisplay(), m_aForeignTopLevelWindow ); gdk_window_set_events( m_pForeignTopLevel, GDK_STRUCTURE_MASK ); if( pSysData->nSize > sizeof(pSysData->nSize)+sizeof(pSysData->aWindow) && pSysData->bXEmbedSupport ) @@ -1209,7 +1209,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData ) m_nStyle = SalFrameStyleFlags::PLUG; InitCommon(); - m_pForeignParent = gdk_window_foreign_new_for_display( getGdkDisplay(), m_aForeignParentWindow ); + m_pForeignParent = gdk_x11_window_foreign_new_for_display( getGdkDisplay(), m_aForeignParentWindow ); gdk_window_set_events( m_pForeignParent, GDK_STRUCTURE_MASK ); //FIXME: Handling embedded windows, is going to be fun ... |