cui/source/options/optgdlg.cxx | 2 +-
vcl/unx/gtk4/gtkinst.cxx | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ad875b928780885a762e91af9b91768882616eaa
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 14 16:10:45 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 14 22:09:06 2021 +0200
gtk4: advertise as gtk4 not gtk3
Change-Id: I7f38238109f79cc8b87d41999a8355879761a894
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115626
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4bb8eb7713d6..b14b73daa1a5 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -579,7 +579,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xMouseMiddleLB(m_xBuilder->weld_combo_box("mousemiddle"))
, m_xMoreIcons(m_xBuilder->weld_button("btnMoreIcons"))
{
- if (Application::GetToolkitName() == "gtk3")
+ if (Application::GetToolkitName().startsWith("gtk"))
m_xMenuIconBox->hide();
m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage,
OnAntialiasingToggled ) );
diff --git a/vcl/unx/gtk4/gtkinst.cxx b/vcl/unx/gtk4/gtkinst.cxx
index 50374171e518..a1066a6d3548 100644
--- a/vcl/unx/gtk4/gtkinst.cxx
+++ b/vcl/unx/gtk4/gtkinst.cxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+// make gtk4 plug advertise correctly as gtk4
+#define GTK_TOOLKIT_NAME "gtk4"
+
#include "../gtk3/gtkinst.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
