diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-12-29 10:45:50 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-12-29 23:28:48 +0100 |
| commit | c0eee433e079d8e3413f4691607e075b99af92b0 (patch) | |
| tree | 07fa3eb0679bd914e6c2dc7aaa60819725ce881f /vcl | |
| parent | c7efa4fd4f57fd4e0a46d1aee9a9f0f0652bb67b (diff) | |
Expand macro COMPAT_BODY in vcl
Change-Id: I598ba7a6f8c51958d8130448529d21073004aad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108448
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index cc3899e8fa4d..81dbbf63670c 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3900,30 +3900,36 @@ void Window::RequestDoubleBuffering(bool bRequest) * dispose and this altered a lot of code paths, that * are better left unchanged for now. */ -#define COMPAT_BODY(method,args) \ - if (!mpWindowImpl || mpWindowImpl->mbInDispose) \ - Window::method args; \ - else \ - method args; - void Window::CompatGetFocus() { - COMPAT_BODY(GetFocus,()) + if (!mpWindowImpl || mpWindowImpl->mbInDispose) + Window::GetFocus(); + else + GetFocus(); } void Window::CompatLoseFocus() { - COMPAT_BODY(LoseFocus,()) + if (!mpWindowImpl || mpWindowImpl->mbInDispose) + Window::LoseFocus(); + else + LoseFocus(); } void Window::CompatStateChanged( StateChangedType nStateChange ) { - COMPAT_BODY(StateChanged,(nStateChange)) + if (!mpWindowImpl || mpWindowImpl->mbInDispose) + Window::StateChanged(nStateChange); + else + StateChanged(nStateChange); } void Window::CompatDataChanged( const DataChangedEvent& rDCEvt ) { - COMPAT_BODY(DataChanged,(rDCEvt)) + if (!mpWindowImpl || mpWindowImpl->mbInDispose) + Window::DataChanged(rDCEvt); + else + DataChanged(rDCEvt); } bool Window::CompatPreNotify( NotifyEvent& rNEvt ) |