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

wayland: Remove window cursor hash

Browse Source
This commit is contained in:
Kristian Høgsberg 2011-02-11 10:06:56 -05:00
parent ffe3af7f1c
commit 152dca40d3
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gdk/wayland/gdkwindow-wayland.c
View File

@ -95,7 +95,6 @@ struct _GdkWindowImplWayland
GdkWindow *wrapper; GdkWindow *wrapper;
GdkCursor *cursor; GdkCursor *cursor;
GHashTable *device_cursor;
gint8 toplevel_window_type; gint8 toplevel_window_type;
@ -158,8 +157,6 @@ static void
_gdk_window_impl_wayland_init (GdkWindowImplWayland *impl) _gdk_window_impl_wayland_init (GdkWindowImplWayland *impl)
{ {
impl->toplevel_window_type = -1; impl->toplevel_window_type = -1;
impl->device_cursor = g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) gdk_cursor_unref);
} }
/** /**
@ -368,8 +365,6 @@ gdk_window_impl_wayland_finalize (GObject *object)
if (impl->server_surface) if (impl->server_surface)
cairo_surface_destroy (impl->server_surface); cairo_surface_destroy (impl->server_surface);
g_hash_table_destroy (impl->device_cursor);
G_OBJECT_CLASS (_gdk_window_impl_wayland_parent_class)->finalize (object); G_OBJECT_CLASS (_gdk_window_impl_wayland_parent_class)->finalize (object);
} }
@ -595,21 +590,9 @@ gdk_window_wayland_set_device_cursor (GdkWindow *window,
GdkDevice *device, GdkDevice *device,
GdkCursor *cursor) GdkCursor *cursor)
{ {
GdkWindowImplWayland *impl;
g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (GDK_IS_DEVICE (device)); g_return_if_fail (GDK_IS_DEVICE (device));
impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (!cursor)
g_hash_table_remove (impl->device_cursor, device);
else
{
g_hash_table_replace (impl->device_cursor,
device, gdk_cursor_ref (cursor));
}
if (!GDK_WINDOW_DESTROYED (window)) if (!GDK_WINDOW_DESTROYED (window))
GDK_DEVICE_GET_CLASS (device)->set_window_cursor (device, window, cursor); GDK_DEVICE_GET_CLASS (device)->set_window_cursor (device, window, cursor);
} }