diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-06 12:52:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-06 12:52:01 +0000 |
| commit | 124be258e9786eee080f4ffee905a9a0f7472f14 (patch) | |
| tree | 14f245fc7613186b4fd5c778b66217f8846bb4b7 /vcl/unx/source | |
| parent | 6d0873a7dfa747359556c12aea5ab031c3c16e87 (diff) | |
INTEGRATION: CWS docking1 (1.172.12); FILE MERGED
2004/05/30 11:09:15 cd 1.172.12.4: RESYNC: (1.173-1.177); FILE MERGED
2004/05/01 23:23:46 cd 1.172.12.3: RESYNC: (1.172-1.173); FILE MERGED
2004/04/23 17:09:45 ssa 1.172.12.2: #i24913# correct typos in GetPointerState()
2004/04/02 12:06:25 ssa 1.172.12.1: #i24913# provide method to actively query the mouse pointer
Diffstat (limited to 'vcl/unx/source')
| -rw-r--r-- | vcl/unx/source/window/salframe.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 82ce2b738654..01172a4f6f10 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.179 $ + * $Revision: 1.180 $ * - * last change: $Author: rt $ $Date: 2004-06-17 12:29:52 $ + * last change: $Author: obo $ $Date: 2004-07-06 13:52:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2244,8 +2244,9 @@ static USHORT sal_GetCode( int state ) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -ULONG X11SalFrame::GetCurrentModButtons() +SalFrame::SalPointerState X11SalFrame::GetPointerState() { + SalPointerState aState; XLIB_Window aRoot, aChild; int rx, ry, wx, wy; unsigned int nMask = 0; @@ -2257,7 +2258,10 @@ ULONG X11SalFrame::GetCurrentModButtons() &wx, &wy, &nMask ); - return sal_GetCode( nMask ); + + aState.maPos = Point(wx, wy); + aState.mnState = sal_GetCode( nMask ); + return aState; } long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) |