summaryrefslogtreecommitdiff
path: root/vcl/inc/unx/gtk/gtkframe.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-05-07 13:05:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-05-10 10:57:33 +0200
commitbc4e15d23cbcaf0a1bff32d4d5d9079805e298e5 (patch)
treec69c71a13ed1d3cb6e4177ce46e6a5ee19a8b27b /vcl/inc/unx/gtk/gtkframe.hxx
parent2dbf36132a8886b94c5fbb2255dfae9e6028a5bd (diff)
rename GtkDropTarget and GtkDragSource to avoid conflicts
Change-Id: I7a51cb6939204105cf49c91c92fdf33f9cb7cc42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115292 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc/unx/gtk/gtkframe.hxx')
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index b62f5b2e786e..f2e2386f7971 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -52,8 +52,8 @@ class GtkSalGraphics;
class GtkSalDisplay;
typedef sal_uIntPtr GdkNativeWindow;
-class GtkDropTarget;
-class GtkDragSource;
+class GtkInstDropTarget;
+class GtkInstDragSource;
class GtkDnDTransferable;
class GtkSalMenu;
@@ -201,8 +201,8 @@ class GtkSalFrame final : public SalFrame
tools::Long m_nWidthRequest;
tools::Long m_nHeightRequest;
cairo_region_t* m_pRegion;
- GtkDropTarget* m_pDropTarget;
- GtkDragSource* m_pDragSource;
+ GtkInstDropTarget* m_pDropTarget;
+ GtkInstDragSource* m_pDragSource;
bool m_bGeometryIsProvisional;
bool m_bIconSetWhileUnmapped;
@@ -349,25 +349,25 @@ public:
void damaged(sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop,
sal_Int32 nExtentsRight, sal_Int32 nExtentsBottom) const;
- void registerDropTarget(GtkDropTarget* pDropTarget)
+ void registerDropTarget(GtkInstDropTarget* pDropTarget)
{
assert(!m_pDropTarget);
m_pDropTarget = pDropTarget;
}
- void deregisterDropTarget(GtkDropTarget const * pDropTarget)
+ void deregisterDropTarget(GtkInstDropTarget const * pDropTarget)
{
assert(m_pDropTarget == pDropTarget); (void)pDropTarget;
m_pDropTarget = nullptr;
}
- void registerDragSource(GtkDragSource* pDragSource)
+ void registerDragSource(GtkInstDragSource* pDragSource)
{
assert(!m_pDragSource);
m_pDragSource = pDragSource;
}
- void deregisterDragSource(GtkDragSource const * pDragSource)
+ void deregisterDragSource(GtkInstDragSource const * pDragSource)
{
assert(m_pDragSource == pDragSource); (void)pDragSource;
m_pDragSource = nullptr;