callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use standard cursor names

Browse Source 
This changes GTK+ to use gdk_cursor_new_from_name() with the
'standard' css names, instead of GdkCursorType.

https://bugzilla.gnome.org/show_bug.cgi?id=652085
This commit is contained in:
Matthias Clasen
2015-05-09 22:50:02 -04:00
parent b3fb1aefd8
commit 5c2759af3c
15 changed files with 44 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtktextview.c
View File

@ -4488,7 +4488,7 @@ gtk_text_view_state_flags_changed (GtkWidget *widget,
if (gtk_widget_get_realized (widget))
{
if (gtk_widget_is_sensitive (widget))
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
cursor = gdk_cursor_new_from_name (gtk_widget_get_display (widget), "text");
else
cursor = NULL;
@ -4516,7 +4516,7 @@ set_invisible_cursor (GdkWindow *window)
GdkCursor *cursor;
display = gdk_window_get_display (window);
cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
cursor = gdk_cursor_new_from_name (display, "none");
gdk_window_set_cursor (window, cursor);
@ -4539,10 +4539,11 @@ gtk_text_view_unobscure_mouse_cursor (GtkTextView *text_view)
{
if (text_view->priv->mouse_cursor_obscured)
{
GdkDisplay *display;
GdkCursor *cursor;
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (text_view)),
GDK_XTERM);
display = gtk_widget_get_display (GTK_WIDGET (text_view));
cursor = gdk_cursor_new_from_name (display, "text");
gdk_window_set_cursor (text_view->priv->text_window->bin_window, cursor);
g_object_unref (cursor);
text_view->priv->mouse_cursor_obscured = FALSE;
@ -9433,6 +9434,7 @@ text_window_realize (GtkTextWindow *win,
GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
GdkDisplay *display;
GdkCursor *cursor;
attributes.window_type = GDK_WINDOW_CHILD;
@ -9485,12 +9487,11 @@ text_window_realize (GtkTextWindow *win,
case GTK_TEXT_WINDOW_TEXT:
if (gtk_widget_is_sensitive (widget))
{
/* I-beam cursor */
cursor = gdk_cursor_new_for_display (gdk_window_get_display (window),
GDK_XTERM);
display = gdk_window_get_display (window);
cursor = gdk_cursor_new_from_name (display, "text");
gdk_window_set_cursor (win->bin_window, cursor);
g_object_unref (cursor);
}
}
gtk_im_context_set_client_window (GTK_TEXT_VIEW (widget)->priv->im_context,
win->window);