vcl/inc/unx/gtk/gtkinst.hxx | 2 +-
vcl/unx/gtk3/gtkinst.cxx | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit b2fefcad3236970284e559ba8cd018511a8cacce
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 12 13:58:52 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 12 16:30:26 2021 +0200
gtk4: enable CreateBuilder but forward to generic one still
Change-Id: Ifba5d0de1606ed238a3e71c4149baf1c97848b1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115483
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index ce3e1232be6a..596f9c3feccb 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -244,8 +244,8 @@ public:
virtual css::uno::Reference< css::uno::XInterface > CreateDragSource()
override;
virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget()
override;
virtual OpenGLContext* CreateOpenGLContext() override;
-#if !GTK_CHECK_VERSION(4, 0, 0)
virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const
OUString& rUIRoot, const OUString& rUIFile) override;
+#if !GTK_CHECK_VERSION(4, 0, 0)
virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const
OUString& rUIRoot, const OUString& rUIFile,
bool bAllowCycleFocusOut,
sal_uInt64 nLOKWindowId = 0) override;
#endif
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 93c8197f75c1..906c94e8966d 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -14139,6 +14139,7 @@ std::unique_ptr<weld::Label>
GtkInstanceFrame::weld_label_widget() const
return nullptr;
#endif
}
+
#if !GTK_CHECK_VERSION(4, 0, 0)
namespace {
@@ -17498,6 +17499,13 @@ bool IsAllowedBuiltInIcon(std::u16string_view iconName)
return VclBuilder::mapStockToSymbol(iconName) != SymbolType::DONTKNOW;
}
+}
+#endif
+
+#if !GTK_CHECK_VERSION(4, 0, 0)
+
+namespace {
+
class GtkInstanceBuilder : public weld::Builder
{
private:
@@ -18338,7 +18346,6 @@ void GtkInstanceWidget::help_hierarchy_foreach(const
std::function<bool(const OS
}
}
-#if !GTK_CHECK_VERSION(4, 0, 0)
weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const
OUString& rUIRoot, const OUString& rUIFile)
{
#if !GTK_CHECK_VERSION(4, 0, 0)
@@ -18351,7 +18358,6 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget*
pParent, const OUString&
return SalInstance::CreateBuilder(pParent, rUIRoot, rUIFile);
#endif
}
-#endif
#if !GTK_CHECK_VERSION(4, 0, 0)
// tdf#135965 for the case of native widgets inside a GtkSalFrame and F1
pressed, run help
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
