summaryrefslogtreecommitdiff
path: root/dtrans/source/X11
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:28:21 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:28:21 +0000
commitebd4a958053863c02a9cbc90ee07fe15504fb647 (patch)
tree9e16328811ad40c8e9dd1a54bff40c5903cc4100 /dtrans/source/X11
parentad33f5057fe29880c6190efd2b6cf62cd3849b5e (diff)
INTEGRATION: CWS vcl13 (1.22.22); FILE MERGED
2003/06/13 18:33:54 pl 1.22.22.2: #110062# flush sent event, prepare for applications forgetting to call dropComplete, XDND V5 2003/06/12 12:17:15 pl 1.22.22.1: #110126# do not start drag without a mouse button pressed, really deregister drop targets, stop drag if drop target that started the drag is dereigistered
Diffstat (limited to 'dtrans/source/X11')
-rw-r--r--dtrans/source/X11/X11_selection.hxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/dtrans/source/X11/X11_selection.hxx b/dtrans/source/X11/X11_selection.hxx
index a840ea99154b..c137f7ef3127 100644
--- a/dtrans/source/X11/X11_selection.hxx
+++ b/dtrans/source/X11/X11_selection.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: X11_selection.hxx,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: hr $ $Date: 2003-03-25 14:05:28 $
+ * last change: $Author: hr $ $Date: 2003-06-30 14:28:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -340,6 +340,11 @@ namespace x11 {
m_xDropTransferable;
int m_nLastX, m_nLastY;
Time m_nDropTimestamp;
+ // set to true when calling drop()
+ // if another XdndEnter is received this shows that
+ // someone forgot to call dropComplete - we should reset
+ // and react to the new drop
+ bool m_bDropWaitingForCompletion;
// drag only
@@ -347,6 +352,7 @@ namespace x11 {
Window m_aDropWindow;
// either m_aDropWindow or its XdndProxy
Window m_aDropProxy;
+ Window m_aDragSourceWindow;
// XTransferable for Xdnd when we are drag source
Reference< ::com::sun::star::datatransfer::XTransferable >
m_xDragSourceTransferable;