diff options
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 5163b5137a10..a77c38f56a49 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -426,7 +426,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, return pW->OutputToScreenPixel( aPos ); } -FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Point& rPos, sal_uInt16& rHitTest ) +FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Point& rPos, HitTest& rHitTest ) { FloatingWindow* pWin = this; @@ -460,7 +460,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( Rectangle( aPt, pBorderWin->GetSizePixel()) ) ) ; if ( devRect.IsInside( aAbsolute ) ) { - rHitTest = IMPL_FLOATWIN_HITTEST_WINDOW; + rHitTest = HITTEST_WINDOW; return pWin; } @@ -470,7 +470,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin // is already in absolute device coordinates if ( pWin->maFloatRect.IsInside( aAbsolute ) ) { - rHitTest = IMPL_FLOATWIN_HITTEST_RECT; + rHitTest = HITTEST_RECT; return pWin; } @@ -478,7 +478,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin } while ( pWin ); - rHitTest = IMPL_FLOATWIN_HITTEST_OUTSIDE; + rHitTest = HITTEST_OUTSIDE; return NULL; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 4fab9485e00f..0763780b4a65 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -73,7 +73,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, * #93895# since floats are system windows, coordinates have * to be converted to float relative for the hittest */ - sal_uInt16 nHitTest = IMPL_FLOATWIN_HITTEST_OUTSIDE; + HitTest nHitTest = HITTEST_OUTSIDE; FloatingWindow* pFloat = pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pChild, rMousePos, nHitTest ); FloatingWindow* pLastLevelFloat; sal_uLong nPopupFlags; @@ -82,7 +82,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, if ( bMouseLeave ) return true; - if ( !pFloat || (nHitTest & IMPL_FLOATWIN_HITTEST_RECT) ) + if ( !pFloat || (nHitTest == HITTEST_RECT) ) { if ( pSVData->maHelpData.mpHelpWin && !pSVData->maHelpData.mbKeyboardHelp ) ImplDestroyHelpWindow( true ); @@ -107,7 +107,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, // else return true; } - else if ( nHitTest & IMPL_FLOATWIN_HITTEST_RECT ) + else if ( nHitTest == HITTEST_RECT ) { if ( !(pFloat->GetPopupModeFlags() & FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE) ) pFloat->ImplSetMouseDown(); @@ -118,7 +118,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, { if ( pFloat ) { - if ( nHitTest & IMPL_FLOATWIN_HITTEST_RECT ) + if ( nHitTest == HITTEST_RECT ) { if ( pFloat->ImplIsMouseDown() ) pFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); @@ -1420,7 +1420,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv if ( pSVData->maWinData.mpFirstFloat && !pSVData->maWinData.mpCaptureWin && !pSVData->maWinData.mpFirstFloat->ImplIsFloatPopupModeWindow( pWindow ) ) { - sal_uInt16 nHitTest = IMPL_FLOATWIN_HITTEST_OUTSIDE; + HitTest nHitTest = HITTEST_OUTSIDE; pMouseWindow = pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pWindow, aMousePos, nHitTest ); } // then try the window directly beneath the mouse |