IsInModalNonRefMode just forwards to IsInModalMode now

Change-Id: I940b70648ede6239930ba36e755994e7749b2d0b

4 files changed, 3 insertions, 13 deletions

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index f1d7a92a0718..138a283f602d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -993,11 +993,6 @@ public:
     */
     bool                                IsInModalMode() const;
 
-    /**
-     *  Necessary for calc ref input handling from modal dialogs
-     */
-    bool                                IsInModalNonRefMode() const;
-
     void                                SetActivateMode( sal_uInt16 nMode );
     sal_uInt16                          GetActivateMode() const;
 
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 7a4a8262dfa6..782196fd4cc8 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -244,7 +244,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
     }
 
     // If the Window is disabled, then we don't change the focus
-    if ( !IsEnabled() || !IsInputEnabled() || IsInModalNonRefMode() )
+    if ( !IsEnabled() || !IsInputEnabled() || IsInModalMode() )
         return;
 
     // we only need to set the focus if it is not already set
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 827c306e210d..8a5e8c737fb9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3621,11 +3621,6 @@ bool Window::IsInModalMode() const
     return (mpWindowImpl->mpFrameWindow->mpWindowImpl->mpFrameData->mnModalMode != 0);
 }
 
-bool Window::IsInModalNonRefMode() const
-{
-    return IsInModalMode();
-}
-
 void Window::ImplIncModalCount()
 {
     vcl::Window* pFrameWindow = mpWindowImpl->mpFrameWindow;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 06d8fa879dfa..d3c43b03eb3d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -171,7 +171,7 @@ static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& rMouse
             nHelpMode |= HelpEventMode::BALLOON;
         if ( bool(nHelpMode) )
         {
-            if ( pChild->IsInputEnabled() && !pChild->IsInModalNonRefMode() )
+            if ( pChild->IsInputEnabled() && !pChild->IsInModalMode() )
             {
                 HelpEvent aHelpEvent( rMousePos, nHelpMode );
                 pSVData->maHelpData.mbRequestingHelp = true;
@@ -377,7 +377,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
 
         // no mouse messages to disabled windows
         // #106845# if the window was disabed during capturing we have to pass the mouse events to release capturing
-        if ( pSVData->maWinData.mpCaptureWin.get() != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalNonRefMode() ) )
+        if ( pSVData->maWinData.mpCaptureWin.get() != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalMode() ) )
         {
             ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent, bMouseLeave );
             if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE )