diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-12-20 19:20:10 +0100 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:07:07 -0500 |
| commit | 4db086da4b257ddc04cd3ef547a973f09fdf198d (patch) | |
| tree | bff431711c9db043c4879b2a6bbe68edc0845ae5 /gtk | |
| parent | 8e2240f6990e48ac4b27e8ba9364278f689f97e1 (diff) | |
| download | gtk+-4db086da4b257ddc04cd3ef547a973f09fdf198d.tar.gz | |
x11: Rename GdkDisplayX11 to GdkX11Display
Also rename all the macros etc.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkplug.c | 4 | ||||
| -rw-r--r-- | gtk/gtkselection.c | 4 | ||||
| -rw-r--r-- | gtk/gtksocket.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 4c0e8258bb..9cf7ff4de5 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -518,7 +518,7 @@ gtk_plug_construct_for_display (GtkPlug *plug, gpointer user_data = NULL; #ifdef GDK_WINDOWING_X11 - if (GDK_IS_DISPLAY_X11 (display)) + if (GDK_IS_X11_DISPLAY (display)) priv->socket_window = gdk_x11_window_lookup_for_display (display, socket_id); else #endif @@ -543,7 +543,7 @@ gtk_plug_construct_for_display (GtkPlug *plug, } else #ifdef GDK_WINDOWING_X11 - if (GDK_IS_DISPLAY_X11 (display)) + if (GDK_IS_X11_DISPLAY (display)) priv->socket_window = gdk_x11_window_foreign_new_for_display (display, socket_id); #endif diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index eebd8d609f..5ee7b2541d 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -1320,7 +1320,7 @@ selection_set_compound_text (GtkSelectionData *selection_data, gboolean result = FALSE; #ifdef GDK_WINDOWING_X11 - if (GDK_IS_DISPLAY_X11 (selection_data->display)) + if (GDK_IS_X11_DISPLAY (selection_data->display)) { tmp = g_strndup (str, len); if (gdk_x11_display_utf8_to_compound_text (selection_data->display, tmp, @@ -2277,7 +2277,7 @@ _gtk_selection_request (GtkWidget *widget, /* Create GdkWindow structure for the requestor */ #ifdef GDK_WINDOWING_X11 - if (GDK_IS_DISPLAY_X11 (display)) + if (GDK_IS_X11_DISPLAY (display)) info->requestor = gdk_x11_window_foreign_new_for_display (display, event->requestor); else #endif diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index c362b64a2d..c3cf1911ce 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -875,7 +875,7 @@ _gtk_socket_add_window (GtkSocket *socket, GtkSocketPrivate *private = socket->priv; #ifdef GDK_WINDOWING_X11 - if (GDK_IS_DISPLAY_X11 (display)) + if (GDK_IS_X11_DISPLAY (display)) private->plug_window = gdk_x11_window_lookup_for_display (display, xid); else #endif @@ -912,7 +912,7 @@ _gtk_socket_add_window (GtkSocket *socket, if (!private->plug_window) { #ifdef GDK_WINDOWING_X11 - if (GDK_IS_DISPLAY_X11 (display)) + if (GDK_IS_X11_DISPLAY (display)) private->plug_window = gdk_x11_window_foreign_new_for_display (display, xid); #endif if (!private->plug_window) /* was deleted before we could get it */ |