diff options
| -rw-r--r-- | include/vcl/event.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 10 |
3 files changed, 3 insertions, 11 deletions
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 6cd6f4a54c83..45d7b5df750c 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -276,9 +276,7 @@ enum class MouseNotifyEvent GETFOCUS = 6, LOSEFOCUS = 7, COMMAND = 8, - DESTROY = 9, INPUTENABLE = 10, - INPUTDISABLE = 11, EXECUTEDIALOG = 100, ENDEXECUTEDIALOG = 101 }; diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 8e62ca2c4a38..f55359981ced 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -117,7 +117,7 @@ bool SfxFrameWindow_Impl::EventNotify( NotifyEvent& rNEvt ) if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) ) return true; } - else if ( rNEvt.GetType() == MouseNotifyEvent::EXECUTEDIALOG /*|| rNEvt.GetType() == MouseNotifyEvent::INPUTDISABLE*/ ) + else if ( rNEvt.GetType() == MouseNotifyEvent::EXECUTEDIALOG ) { pView->SetModalMode( true ); return true; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 99e3db2abc97..a12d597091a7 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -395,12 +395,6 @@ void Window::dispose() // hide window in order to trigger the Paint-Handling Hide(); - // announce the window is to be destroyed - { - NotifyEvent aNEvt( MouseNotifyEvent::DESTROY, this ); - CompatNotify( aNEvt ); - } - // EndExtTextInputMode if ( pSVData->maWinData.mpExtTextInputWin == this ) { @@ -2534,9 +2528,9 @@ void Window::EnableInput( bool bEnable, bool bChild ) ImplGenerateMouseMove(); // #104827# notify parent - if ( bNotify ) + if ( bNotify && bEnable ) { - NotifyEvent aNEvt( bEnable ? MouseNotifyEvent::INPUTENABLE : MouseNotifyEvent::INPUTDISABLE, this ); + NotifyEvent aNEvt( MouseNotifyEvent::INPUTENABLE, this ); CompatNotify( aNEvt ); } } |