[gtk/bin-removal: 43/49] tooltipwindow: Derive from GtkWidget
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/bin-removal: 43/49] tooltipwindow: Derive from GtkWidget
- Date: Mon, 4 May 2020 01:13:44 +0000 (UTC)
commit e31c33291c89d6edae7b443869146d4b069578d9
Author: Matthias Clasen <mclasen redhat com>
Date: Sun May 3 16:36:22 2020 -0400
tooltipwindow: Derive from GtkWidget
gtk/gtktooltipwindow.c | 14 +++++++-------
gtk/gtktooltipwindowprivate.h | 2 +-
gtk/ui/gtktooltipwindow.ui | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c
index 1b86bef664..7dc9c50a82 100644
--- a/gtk/gtktooltipwindow.c
+++ b/gtk/gtktooltipwindow.c
@@ -44,7 +44,7 @@
struct _GtkTooltipWindow
{
- GtkWindow parent_instance;
+ GtkWidget parent_instance;
GdkSurface *surface;
GskRenderer *renderer;
@@ -67,12 +67,12 @@ struct _GtkTooltipWindow
struct _GtkTooltipWindowClass
{
- GtkWindowClass parent_class;
+ GtkWidgetClass parent_class;
};
static void gtk_tooltip_window_native_init (GtkNativeInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (GtkTooltipWindow, gtk_tooltip_window, GTK_TYPE_BIN,
+G_DEFINE_TYPE_WITH_CODE (GtkTooltipWindow, gtk_tooltip_window, GTK_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (GTK_TYPE_NATIVE,
gtk_tooltip_window_native_init))
@@ -298,7 +298,7 @@ gtk_tooltip_window_map (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_tooltip_window_parent_class)->map (widget);
- child = gtk_bin_get_child (GTK_BIN (widget));
+ child = gtk_window_get_child (GTK_WINDOW (widget));
if (child != NULL && gtk_widget_get_visible (child))
gtk_widget_map (child);
}
@@ -316,7 +316,7 @@ gtk_tooltip_window_unmap (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_tooltip_window_parent_class)->unmap (widget);
gdk_surface_hide (window->surface);
- child = gtk_bin_get_child (GTK_BIN (widget));
+ child = gtk_window_get_child (GTK_WINDOW (widget));
if (child != NULL)
gtk_widget_unmap (child);
}
@@ -332,7 +332,7 @@ gtk_tooltip_window_measure (GtkWidget *widget,
{
GtkWidget *child;
- child = gtk_bin_get_child (GTK_BIN (widget));
+ child = gtk_window_get_child (GTK_WINDOW (widget));
if (child)
gtk_widget_measure (child,
@@ -350,7 +350,7 @@ gtk_tooltip_window_size_allocate (GtkWidget *widget,
GtkTooltipWindow *window = GTK_TOOLTIP_WINDOW (widget);
GtkWidget *child;
- child = gtk_bin_get_child (GTK_BIN (window));
+ child = gtk_window_get_child (GTK_WINDOW (window));
if (child)
gtk_widget_allocate (child, width, height, baseline, NULL);
diff --git a/gtk/gtktooltipwindowprivate.h b/gtk/gtktooltipwindowprivate.h
index 13556d41e3..61e6b91864 100644
--- a/gtk/gtktooltipwindowprivate.h
+++ b/gtk/gtktooltipwindowprivate.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
#define GTK_TYPE_TOOLTIP_WINDOW (gtk_tooltip_window_get_type ())
-G_DECLARE_FINAL_TYPE (GtkTooltipWindow, gtk_tooltip_window, GTK, TOOLTIP_WINDOW, GtkWindow)
+G_DECLARE_FINAL_TYPE (GtkTooltipWindow, gtk_tooltip_window, GTK, TOOLTIP_WINDOW, GtkWidget)
GtkWidget * gtk_tooltip_window_new (void);
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index 2dd5584646..59bd028d89 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
- <template class="GtkTooltipWindow" parent="GtkBin">
+ <template class="GtkTooltipWindow" parent="GtkWidget">
<style>
<class name="background"/>
</style>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]