summaryrefslogtreecommitdiff
path: root/gtk/gtksocket.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-07-05 02:58:34 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-07-05 02:58:34 +0000
commitc1a14d036d1abe6475a8b8776381dcca0fe5bbef (patch)
treeeff0bb09ed9646522fc4958f00d8194a86ff0045 /gtk/gtksocket.h
parent3da3e77620e61145cff33e4d1e72eb4e976f676a (diff)
downloadgdk-pixbuf-c1a14d036d1abe6475a8b8776381dcca0fe5bbef.tar.gz
Check GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel (widget)), not
Wed Jul 4 22:35:40 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c gtk/gtkwidget.c: Check GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel (widget)), not GTK_WIDGET_GET_ANCESTOR ... see http://mail.gnome.org/archives/gtk-devel-list/2001-July/msg00072.html. Indicate the best practice in the docs for gtk_widget_get_toplevel(). * gtk/gtkwidget.[ch]: Expose a private _gtk_widget_hierarchy_changed(), so GtkPlug can give the correct signals when transforming from a child to a toplevel. * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): Handle reparentation correctly. * gtk/gtkwidget.c (gtk_widget_propagate_hierarchy_changed): Propagate the previous_toplevel argument down properly. * gtk/gtklabel.c (gtk_label_finalize): Fix unrefing of wrong atr list. * gtk/gtkplug.[ch]: Add an "embedded" signal. * gtk/gtksocket.[ch]: Add "child_added", "child_removed" signals. * gtk/gtkplug.[ch] gtk/gtksocket.[ch]: Add functions gtk_plug_get_id(), gtk_socket_get_id(), to avoid the user having to worry about realization, and gdkx.h. * tests/testsocket.c: Extend to try out the new signals and gtk_plug/socket_get_id(). * gtk/gtklabel.c (gtk_label_set_pattern_internal): Fix setting of underline attributes. * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore DestroyNotify events from SubstructureNotifyMask * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): Switch GDK_WINDOW_TYPE (window) as needed. * gdk/x11/gdkwindow-x11.c (gdk_window_new): Clean up, allow creation of toplevel windows as children of foreign windows. * gtk/gtkplug.c: Remove hacks involving changing private fields of GdkWindow. * gtk/gtkplug.[ch] gtk/gtksocket.c: Work to make exactly the same signals and notification be emitted for local embedding as for inter-process embedding.
Diffstat (limited to 'gtk/gtksocket.h')
-rw-r--r--gtk/gtksocket.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index 18a762bbe..14ee4165a 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -70,13 +70,23 @@ struct _GtkSocket
struct _GtkSocketClass
{
GtkContainerClass parent_class;
+
+ gboolean (*plug_added) (GtkSocket *socket);
+ gboolean (*plug_removed) (GtkSocket *socket);
};
GtkWidget* gtk_socket_new (void);
GtkType gtk_socket_get_type (void) G_GNUC_CONST;
-void gtk_socket_steal (GtkSocket *socket,
+
+void gtk_socket_add_id (GtkSocket *socket,
+ GdkNativeWindow id);
+GdkNativeWindow gtk_socket_get_id (GtkSocket *socket);
+
+#ifndef GTK_DISABLE_DEPRECATED
+void gtk_socket_steal (GtkSocket *socket,
GdkNativeWindow wid);
+#endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus
}