diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-07-03 14:14:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-07-03 14:14:30 +0000 |
| commit | f409cd9b7f6513acf816e5b3335231bc733f29a6 (patch) | |
| tree | 1df2a5203199c8007960dacf78154650698f0a97 /gtk/gtkplug.h | |
| parent | b6cc525fa098f0cade116e0dc29e5614237d48ab (diff) | |
| download | gtk+-f409cd9b7f6513acf816e5b3335231bc733f29a6.tar.gz | |
For XEMBED embedding add a _XEMBED_INFO property to the client with
Mon Jul 2 16:53:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/xembed.h gtk/gtkplug.c gtk/gtksocket.c: For
XEMBED embedding add a _XEMBED_INFO property to the
client with version number and a "mapped" flags.
Use the mapped flag instead of the racy MapRequestEvent
* gtk/gtksocket.c: Clean up the gtk_socket_steal()
code to reliably set things (when the child is a passive
embedder participating in the XEMBED protocol) intead
of just being a hack for embedding non-participating
programs. Fix various bugs and race conditions.
* gtk/gtksocket.[ch] gtk/gtkplug.[ch]: Make local embedding
work by simply making the GtkSocket the gtk parent
of the GtkPlug. Set a flag in this case and make
the GtkPlug work like a normal container by overriding
methods such as check_resize and "chaining past" GtkWindow
to GtkBin.
* gtk/gtkentry.c (gtk_entry_real_activate)
gtk/gtkmain.c (gtk_propagate_event):
Eliminate use of gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW).
* gtk/gtkwidget.c (gtk_widget_get_toplevel,
gtk_widget_get_ancestor):
Explain why gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW)
might not give the expected result and recommend
an alternative.
* tests/testsocket.c tests/testsocket_child.c
tests/testsocket_common.c tests/Makefile.am: Extended
to test different type of adding plugs to sockets
(local,active,passive), and to test mapping/unmapping
the plug.
* gdk/gdkwindow.c (_gdk_window_destroy_hierarchy): Don't
mark the window as destroyed until after we
called _gdk_windowing_window_destroy().
(_gdk_windowing_window_destroy() may use GDK functions
on the window.)
* gdk/x11/gdkinput.c: Remove the check for finalization -
devices can be finalized under some circumnstances.
* gdk/x11/gdkinput-x11.c (gdk_input_device_new): Fix
small problem with GDK_TYPE_DEVICE.
Diffstat (limited to 'gtk/gtkplug.h')
| -rw-r--r-- | gtk/gtkplug.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index 37907574da..d3274c50b4 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -28,6 +28,7 @@ #include <gdk/gdk.h> +#include <gtk/gtksocket.h> #include <gtk/gtkwindow.h> @@ -55,7 +56,7 @@ struct _GtkPlug GdkWindow *socket_window; GtkWidget *modality_window; GtkWindowGroup *modality_group; - gboolean same_app; + guint same_app : 1; }; struct _GtkPlugClass @@ -69,6 +70,9 @@ void gtk_plug_construct (GtkPlug *plug, GdkNativeWindow socket_id); GtkWidget* gtk_plug_new (GdkNativeWindow socket_id); +void _gtk_plug_add_to_socket (GtkPlug *plug, + GtkSocket *socket); + #ifdef __cplusplus } #endif /* __cplusplus */ |