diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-01-28 10:56:40 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-01-28 17:06:06 +0100 |
| commit | 50e1589a191f767da5a90520dfdd72f04a5f45f9 (patch) | |
| tree | 20562f0510598377603e3d2ba041a6feebc82c6d /gtk | |
| parent | 89722d41c4db0c2b32b7ea13aea672414bb282ca (diff) | |
| download | gtk+-50e1589a191f767da5a90520dfdd72f04a5f45f9.tar.gz | |
plug/socket: Clarify docs about availablility of widgets
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkplug.c | 11 | ||||
| -rw-r--r-- | gtk/gtksocket.c | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 8fbcfbd820..512d234b12 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -59,9 +59,16 @@ * Any widgets contained in the #GtkPlug then will appear * inside the first application's window. * + * The communication between a #GtkSocket and a #GtkPlug follows the + * <ulink url="http://www.freedesktop.org/Standards/xembed-spec">XEmbed</ulink> + * protocol. This protocol has also been implemented in other toolkits, e.g. + * <application>Qt</application>, allowing the same level of integration + * when embedding a <application>Qt</application> widget in GTK or vice versa. + * * <note> - * The #GtkPlug and #GtkSocket widgets are currently not available - * on all platforms supported by GTK+. + * The #GtkPlug and #GtkSocket widgets are only available when GTK is + * compiled for the X11 platform and %GDK_WINDOWING_X11 is defined. + * They can only be used on a #GdkX11Display. * </note> */ diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 016c6073b4..263972de7e 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -109,8 +109,9 @@ * when embedding a <application>Qt</application> widget in GTK or vice versa. * * <note> - * The #GtkPlug and #GtkSocket widgets are currently not available - * on all platforms supported by GTK+. + * The #GtkPlug and #GtkSocket widgets are only available when GTK is + * compiled for the X11 platform and %GDK_WINDOWING_X11 is defined. + * They can only be used on a #GdkX11Display. * </note> */ |