AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove gtk_window_set_hardcoded_surface

Browse Source 
It is not used anymore.
This commit is contained in:
Matthias Clasen 2019-12-30 00:31:32 -05:00
parent 538efd0cc6
commit baf99bb868
2 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/gtkwindow.c
View File

@ -266,8 +266,6 @@ typedef struct
GtkGesture *bubble_drag_gesture;
GtkEventController *key_controller;
GdkSurface *hardcoded_surface;
GtkCssNode *decoration_node;
GdkSurface *surface;
@ -5536,27 +5534,19 @@ gtk_window_realize (GtkWidget *widget)
gtk_widget_get_allocation (widget, &allocation);
if (priv->hardcoded_surface)
switch (priv->type)
{
surface = priv->hardcoded_surface;
gdk_surface_resize (surface, allocation.width, allocation.height);
}
else
{
switch (priv->type)
{
case GTK_WINDOW_TOPLEVEL:
surface = gdk_surface_new_toplevel (gtk_widget_get_display (widget),
allocation.width,
allocation.height);
break;
case GTK_WINDOW_POPUP:
surface = gdk_surface_new_temp (gtk_widget_get_display (widget), &allocation);
break;
default:
g_error (G_STRLOC": Unknown window type %d!", priv->type);
break;
}
case GTK_WINDOW_TOPLEVEL:
surface = gdk_surface_new_toplevel (gtk_widget_get_display (widget),
allocation.width,
allocation.height);
break;
case GTK_WINDOW_POPUP:
surface = gdk_surface_new_temp (gtk_widget_get_display (widget), &allocation);
break;
default:
g_error (G_STRLOC": Unknown window type %d!", priv->type);
break;
}
priv->surface = surface;
@ -5707,8 +5697,6 @@ gtk_window_unrealize (GtkWidget *widget)
gdk_surface_set_widget (surface, NULL);
gdk_surface_destroy (surface);
g_clear_object (&priv->surface);
priv->hardcoded_surface = NULL;
}
static void
@ -9118,18 +9106,6 @@ gtk_window_enable_debugging (GtkWindow *window,
return TRUE;
}
void
gtk_window_set_hardcoded_surface (GtkWindow *window,
GdkSurface *surface)
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (!_gtk_widget_get_realized (GTK_WIDGET (window)));
g_set_object (&priv->hardcoded_surface, surface);
}
#ifdef GDK_WINDOWING_WAYLAND
typedef struct {
GtkWindow *window;

3
gtk/gtkwindowprivate.h
View File

@ -115,9 +115,6 @@ gboolean _gtk_window_is_popover_widget (GtkWindow *window,
GdkPaintable * gtk_window_get_icon_for_size (GtkWindow *window,
int size);
void gtk_window_set_hardcoded_surface (GtkWindow *window,
GdkSurface *surface);
/* Exported handles */
typedef void (*GtkWindowHandleExported) (GtkWindow *window,