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

scrolledwindow: Use gdk_window_new_child()

Browse Source
This commit is contained in:
Benjamin Otte 2016-10-17 20:20:32 +02:00
parent 73ef9e1438
commit e54a76aee7
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkscrolledwindow.c
View File

@ -3999,23 +3999,12 @@ create_indicator_window (GtkScrolledWindow *scrolled_window,
GtkWidget *widget = GTK_WIDGET (scrolled_window); GtkWidget *widget = GTK_WIDGET (scrolled_window);
GtkAllocation allocation; GtkAllocation allocation;
GdkWindow *window; GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
gtk_scrolled_window_allocate_scrollbar (scrolled_window, child, &allocation); gtk_scrolled_window_allocate_scrollbar (scrolled_window, child, &allocation);
attributes.window_type = GDK_WINDOW_CHILD; window = gdk_window_new_child (gtk_widget_get_window (widget),
attributes.wclass = GDK_INPUT_OUTPUT; gtk_widget_get_events (widget),
&allocation);
attributes.width = allocation.width;
attributes.height = allocation.height;
attributes.x = allocation.x;
attributes.y = allocation.y;
attributes_mask = GDK_WA_X | GDK_WA_Y;
attributes.event_mask = gtk_widget_get_events (widget);
window = gdk_window_new (gtk_widget_get_window (widget),
&attributes, attributes_mask);
gtk_widget_register_window (widget, window); gtk_widget_register_window (widget, window);
if (scrolled_window->priv->use_indicators) if (scrolled_window->priv->use_indicators)
@ -4269,24 +4258,15 @@ gtk_scrolled_window_realize (GtkWidget *widget)
GtkScrolledWindowPrivate *priv = scrolled_window->priv; GtkScrolledWindowPrivate *priv = scrolled_window->priv;
GdkWindow *window; GdkWindow *window;
GtkAllocation allocation; GtkAllocation allocation;
GdkWindowAttr attributes;
gint attributes_mask;
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
attributes.window_type = GDK_WINDOW_CHILD; window = gdk_window_new_child (gtk_widget_get_parent_window (widget),
attributes.wclass = GDK_INPUT_OUTPUT; gtk_widget_get_events (widget)
| GDK_ENTER_NOTIFY_MASK
attributes.width = allocation.width; | GDK_LEAVE_NOTIFY_MASK
attributes.height = allocation.height; | GDK_POINTER_MOTION_MASK,
attributes.x = allocation.x; &allocation);
attributes.y = allocation.y;
attributes_mask = GDK_WA_X | GDK_WA_Y;
attributes.event_mask = gtk_widget_get_events (widget) |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK;
window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
gtk_widget_set_window (widget, window); gtk_widget_set_window (widget, window);
gtk_widget_register_window (widget, window); gtk_widget_register_window (widget, window);