gtk/native: Remove gtk_native_check_resize()

This is now handle by the corresponding implemenatations using per
non-gobject-type API.
This commit is contained in:
Jonas Ådahl 2020-12-04 11:18:09 +01:00
parent 4b2aae9950
commit 40a9baa2db
10 changed files with 3 additions and 61 deletions

View File

@ -6970,7 +6970,6 @@ GtkNative
gtk_native_get_for_surface gtk_native_get_for_surface
gtk_native_get_surface gtk_native_get_surface
gtk_native_get_renderer gtk_native_get_renderer
gtk_native_check_resize
gtk_native_get_surface_transform gtk_native_get_surface_transform
<SUBSECTION Private> <SUBSECTION Private>

View File

@ -146,11 +146,6 @@ gtk_drag_icon_move_resize (GtkDragIcon *icon)
} }
} }
static void
gtk_drag_icon_native_check_resize (GtkNative *native)
{
}
static void static void
gtk_drag_icon_present (GtkDragIcon *icon) gtk_drag_icon_present (GtkDragIcon *icon)
{ {
@ -176,7 +171,6 @@ gtk_drag_icon_native_init (GtkNativeInterface *iface)
iface->get_surface = gtk_drag_icon_native_get_surface; iface->get_surface = gtk_drag_icon_native_get_surface;
iface->get_renderer = gtk_drag_icon_native_get_renderer; iface->get_renderer = gtk_drag_icon_native_get_renderer;
iface->get_surface_transform = gtk_drag_icon_native_get_surface_transform; iface->get_surface_transform = gtk_drag_icon_native_get_surface_transform;
iface->check_resize = gtk_drag_icon_native_check_resize;
iface->layout = gtk_drag_icon_native_layout; iface->layout = gtk_drag_icon_native_layout;
} }

View File

@ -373,7 +373,8 @@ allocate_native_children (GtkWidget *widget)
else if (GTK_IS_TOOLTIP_WINDOW (child)) else if (GTK_IS_TOOLTIP_WINDOW (child))
gtk_tooltip_window_present (GTK_TOOLTIP_WINDOW (child)); gtk_tooltip_window_present (GTK_TOOLTIP_WINDOW (child));
else if (GTK_IS_NATIVE (child)) else if (GTK_IS_NATIVE (child))
gtk_native_check_resize (GTK_NATIVE (child)); g_warning ("Unable to present a to the layout manager unknown auxiliary child surface widget type %s",
G_OBJECT_TYPE_NAME (child));
} }
} }

View File

@ -63,11 +63,6 @@ gtk_native_default_get_surface_transform (GtkNative *self,
*y = 0; *y = 0;
} }
static void
gtk_native_default_check_resize (GtkNative *self)
{
}
static void static void
gtk_native_default_layout (GtkNative *self, gtk_native_default_layout (GtkNative *self,
int width, int width,
@ -80,7 +75,6 @@ gtk_native_default_init (GtkNativeInterface *iface)
{ {
iface->get_renderer = gtk_native_default_get_renderer; iface->get_renderer = gtk_native_default_get_renderer;
iface->get_surface_transform = gtk_native_default_get_surface_transform; iface->get_surface_transform = gtk_native_default_get_surface_transform;
iface->check_resize = gtk_native_default_check_resize;
iface->layout = gtk_native_default_layout; iface->layout = gtk_native_default_layout;
quark_gtk_native_private = g_quark_from_static_string ("gtk-native-private"); quark_gtk_native_private = g_quark_from_static_string ("gtk-native-private");
@ -225,23 +219,6 @@ gtk_native_get_surface_transform (GtkNative *self,
return GTK_NATIVE_GET_IFACE (self)->get_surface_transform (self, x, y); return GTK_NATIVE_GET_IFACE (self)->get_surface_transform (self, x, y);
} }
/**
* gtk_native_check_resize:
* @self: a #GtkNative
*
* Reposition and resize a #GtkNative.
*
* Widgets need to call this function on their attached
* native widgets when they receive a new size allocation.
*/
void
gtk_native_check_resize (GtkNative *self)
{
g_return_if_fail (GTK_IS_NATIVE (self));
GTK_NATIVE_GET_IFACE (self)->check_resize (self);
}
/** /**
* gtk_native_get_for_surface: * gtk_native_get_for_surface:
* @surface: a #GdkSurface * @surface: a #GdkSurface

View File

@ -43,9 +43,6 @@ void gtk_native_unrealize (GtkNative *self);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GtkNative * gtk_native_get_for_surface (GdkSurface *surface); GtkNative * gtk_native_get_for_surface (GdkSurface *surface);
GDK_AVAILABLE_IN_ALL
void gtk_native_check_resize (GtkNative *self);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GdkSurface *gtk_native_get_surface (GtkNative *self); GdkSurface *gtk_native_get_surface (GtkNative *self);

View File

@ -23,8 +23,6 @@ struct _GtkNativeInterface
double *x, double *x,
double *y); double *y);
void (* check_resize) (GtkNative *self);
void (* layout) (GtkNative *self, void (* layout) (GtkNative *self,
int width, int width,
int height); int height);

View File

@ -588,11 +588,6 @@ gtk_popover_present (GtkPopover *popover)
present_popup (popover); present_popup (popover);
} }
static void
gtk_popover_native_check_resize (GtkNative *native)
{
}
static void static void
maybe_request_motion_event (GtkPopover *popover) maybe_request_motion_event (GtkPopover *popover)
{ {
@ -1884,7 +1879,6 @@ gtk_popover_native_interface_init (GtkNativeInterface *iface)
iface->get_surface = gtk_popover_native_get_surface; iface->get_surface = gtk_popover_native_get_surface;
iface->get_renderer = gtk_popover_native_get_renderer; iface->get_renderer = gtk_popover_native_get_renderer;
iface->get_surface_transform = gtk_popover_native_get_surface_transform; iface->get_surface_transform = gtk_popover_native_get_surface_transform;
iface->check_resize = gtk_popover_native_check_resize;
iface->layout = gtk_popover_native_layout; iface->layout = gtk_popover_native_layout;
} }

View File

@ -164,11 +164,6 @@ gtk_text_handle_present_surface (GtkTextHandle *handle)
gdk_popup_layout_unref (layout); gdk_popup_layout_unref (layout);
} }
static void
gtk_text_handle_native_check_resize (GtkNative *native)
{
}
void void
gtk_text_handle_present (GtkTextHandle *handle) gtk_text_handle_present (GtkTextHandle *handle)
{ {
@ -199,7 +194,6 @@ gtk_text_handle_native_interface_init (GtkNativeInterface *iface)
iface->get_surface = gtk_text_handle_native_get_surface; iface->get_surface = gtk_text_handle_native_get_surface;
iface->get_renderer = gtk_text_handle_native_get_renderer; iface->get_renderer = gtk_text_handle_native_get_renderer;
iface->get_surface_transform = gtk_text_handle_native_get_surface_transform; iface->get_surface_transform = gtk_text_handle_native_get_surface_transform;
iface->check_resize = gtk_text_handle_native_check_resize;
iface->layout = gtk_text_handle_native_layout; iface->layout = gtk_text_handle_native_layout;
} }

View File

@ -139,11 +139,6 @@ gtk_tooltip_window_relayout (GtkTooltipWindow *window)
gdk_popup_layout_unref (layout); gdk_popup_layout_unref (layout);
} }
static void
gtk_tooltip_window_native_check_resize (GtkNative *native)
{
}
void void
gtk_tooltip_window_present (GtkTooltipWindow *window) gtk_tooltip_window_present (GtkTooltipWindow *window)
{ {
@ -179,7 +174,6 @@ gtk_tooltip_window_native_init (GtkNativeInterface *iface)
iface->get_surface = gtk_tooltip_window_native_get_surface; iface->get_surface = gtk_tooltip_window_native_get_surface;
iface->get_renderer = gtk_tooltip_window_native_get_renderer; iface->get_renderer = gtk_tooltip_window_native_get_renderer;
iface->get_surface_transform = gtk_tooltip_window_native_get_surface_transform; iface->get_surface_transform = gtk_tooltip_window_native_get_surface_transform;
iface->check_resize = gtk_tooltip_window_native_check_resize;
iface->layout = gtk_tooltip_window_native_layout; iface->layout = gtk_tooltip_window_native_layout;
} }
@ -358,7 +352,7 @@ gtk_tooltip_window_show (GtkWidget *widget)
{ {
_gtk_widget_set_visible_flag (widget, TRUE); _gtk_widget_set_visible_flag (widget, TRUE);
gtk_widget_realize (widget); gtk_widget_realize (widget);
gtk_tooltip_window_native_check_resize (GTK_NATIVE (widget)); gtk_tooltip_window_present (GTK_TOOLTIP_WINDOW (widget));
gtk_widget_map (widget); gtk_widget_map (widget);
} }

View File

@ -1870,11 +1870,6 @@ gtk_window_native_get_surface_transform (GtkNative *native,
*y = shadow.top - margin_rect->origin.y; *y = shadow.top - margin_rect->origin.y;
} }
static void
gtk_window_native_check_resize (GtkNative *native)
{
}
static void static void
gtk_window_native_layout (GtkNative *native, gtk_window_native_layout (GtkNative *native,
int width, int width,
@ -1946,7 +1941,6 @@ gtk_window_native_interface_init (GtkNativeInterface *iface)
iface->get_surface = gtk_window_native_get_surface; iface->get_surface = gtk_window_native_get_surface;
iface->get_renderer = gtk_window_native_get_renderer; iface->get_renderer = gtk_window_native_get_renderer;
iface->get_surface_transform = gtk_window_native_get_surface_transform; iface->get_surface_transform = gtk_window_native_get_surface_transform;
iface->check_resize = gtk_window_native_check_resize;
iface->layout = gtk_window_native_layout; iface->layout = gtk_window_native_layout;
} }