[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed May 12 13:55:43 UTC 2021


 vcl/unx/gtk3/gtkinst.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 47cb7376447b35ae6e235a147dfe558390484efb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 12 12:54:43 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 12 15:55:02 2021 +0200

    gtk4: renable providing parent to native dialogs
    
    Change-Id: Ic21d57d8c58db855d80cb905e45a3cd37985ca0b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115480
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 9d9a852444d8..93c8197f75c1 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -18449,10 +18449,8 @@ weld::Window* GtkInstance::GetFrameWeld(const css::uno::Reference<css::awt::XWin
 
 weld::Window* GtkSalFrame::GetFrameWeld() const
 {
-#if !GTK_CHECK_VERSION(4, 0, 0)
     if (!m_xFrameWeld)
         m_xFrameWeld.reset(new GtkInstanceWindow(GTK_WINDOW(widget_get_root(getWindow())), nullptr, false));
-#endif
     return m_xFrameWeld.get();
 }
 


More information about the Libreoffice-commits mailing list