[gtk+] window: Make embedded xid specific to the X11 backend
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] window: Make embedded xid specific to the X11 backend
- Date: Fri, 28 Jan 2011 16:07:46 +0000 (UTC)
commit e1f6a24da9f9a41f3857c6c7090812a9cbd82406
Author: Benjamin Otte <otte redhat com>
Date: Fri Jan 28 14:35:49 2011 +0100
window: Make embedded xid specific to the X11 backend
gtk/gtkwindow.c | 6 ++++++
gtk/gtkwindowprivate.h | 4 ++++
2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index e4a17b5..47bdc08 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2294,6 +2294,7 @@ gtk_window_list_toplevels (void)
return list;
}
+#ifdef GDK_WINDOWING_X11
void
_gtk_window_add_embedded_xid (GtkWindow *window, GdkNativeWindow xid)
{
@@ -2337,6 +2338,7 @@ _gtk_window_remove_embedded_xid (GtkWindow *window, GdkNativeWindow xid)
embedded_windows ?
(GDestroyNotify) g_list_free : NULL);
}
+#endif
static void
gtk_window_dispose (GObject *object)
@@ -5906,6 +5908,7 @@ gtk_window_focus_out_event (GtkWidget *widget,
return FALSE;
}
+#ifdef GDK_WINDOWING_X11
static GdkAtom atom_rcfiles = GDK_NONE;
static GdkAtom atom_iconthemes = GDK_NONE;
@@ -5936,11 +5939,13 @@ send_client_message_to_embedded_windows (GtkWidget *widget,
gdk_event_free (send_event);
}
}
+#endif
static gint
gtk_window_client_event (GtkWidget *widget,
GdkEventClient *event)
{
+#ifdef GDK_WINDOWING_X11
if (!atom_rcfiles)
{
atom_rcfiles = gdk_atom_intern_static_string ("_GTK_READ_RCFILES");
@@ -5958,6 +5963,7 @@ gtk_window_client_event (GtkWidget *widget,
send_client_message_to_embedded_windows (widget, atom_iconthemes);
_gtk_icon_theme_check_reload (gtk_widget_get_display (widget));
}
+#endif
return FALSE;
}
diff --git a/gtk/gtkwindowprivate.h b/gtk/gtkwindowprivate.h
index 7815cda..ab070ab 100644
--- a/gtk/gtkwindowprivate.h
+++ b/gtk/gtkwindowprivate.h
@@ -21,16 +21,20 @@
#ifndef __GTK_WINDOW_PRIVATE_H__
#define __GTK_WINDOW_PRIVATE_H__
+#include <gdk/gdk.h>
+
#include "gtkwindow.h"
G_BEGIN_DECLS
void _gtk_window_internal_set_focus (GtkWindow *window,
GtkWidget *focus);
+#ifdef GDK_WINDOWING_X11
void _gtk_window_remove_embedded_xid (GtkWindow *window,
GdkNativeWindow xid);
void _gtk_window_add_embedded_xid (GtkWindow *window,
GdkNativeWindow xid);
+#endif
void _gtk_window_reposition (GtkWindow *window,
gint x,
gint y);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]