[vte/vte-0-64] widget: Don't implement GtkScrollableInterface:get_border
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/vte-0-64] widget: Don't implement GtkScrollableInterface:get_border
- Date: Wed, 3 Mar 2021 21:10:55 +0000 (UTC)
commit aa9de1826cfc81c0a471fa3bf56e6dd878ce14ea
Author: Christian Persch <chpe src gnome org>
Date: Wed Mar 3 22:10:46 2021 +0100
widget: Don't implement GtkScrollableInterface:get_border
This reverts commit a7b863a6; see
https://gitlab.gnome.org/GNOME/vte/-/issues/336#note_1049578 .
(cherry picked from commit e20739ef0cf88a8bfa31fad0df0c6487b9073f39)
src/vtegtk.cc | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 090975b2..0a26f976 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -114,8 +114,6 @@ private:
std::shared_ptr<vte::platform::Widget> m_widget;
};
-static void vte_terminal_scrollable_iface_init(GtkScrollableInterface* iface) noexcept;
-
#ifdef VTE_DEBUG
G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
{
@@ -123,7 +121,7 @@ G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
g_type_add_instance_private(g_define_type_id,
sizeof(VteTerminalPrivate));
}
g_type_add_class_private (g_define_type_id, sizeof (VteTerminalClassPrivate));
- G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, vte_terminal_scrollable_iface_init)
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, nullptr)
if (_vte_debug_on(VTE_DEBUG_LIFECYCLE)) {
g_printerr("vte_terminal_get_type()\n");
})
@@ -134,7 +132,7 @@ G_DEFINE_TYPE_WITH_CODE(VteTerminal, vte_terminal, GTK_TYPE_WIDGET,
g_type_add_instance_private(g_define_type_id,
sizeof(VteTerminalPrivate));
}
g_type_add_class_private (g_define_type_id, sizeof (VteTerminalClassPrivate));
- G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, vte_terminal_scrollable_iface_init))
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, nullptr))
#endif
static inline auto
@@ -2105,26 +2103,6 @@ vte_terminal_class_init(VteTerminalClass *klass)
#endif
}
-static gboolean
-vte_terminal_scrollable_get_border(GtkScrollable* scrollable,
- GtkBorder* border) noexcept
-try
-{
- *border = *WIDGET(VTE_TERMINAL(scrollable))->padding();
- return true;
-}
-catch (...)
-{
- vte::log_exception();
- return false;
-}
-
-static void
-vte_terminal_scrollable_iface_init(GtkScrollableInterface* iface) noexcept
-{
- iface->get_border = vte_terminal_scrollable_get_border;
-}
-
/* public API */
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]