diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-07-01 00:57:21 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-07-01 00:57:21 +0000 |
| commit | de985fb58e80be74a181fee5e6f2d85d390c9140 (patch) | |
| tree | 0f5375d670b577d09c94a59bcb2ec0b5f3086613 /gtk/gtksocket.c | |
| parent | 95cd4d8e66453e3c0f2e97d8a8eff312bf675b3a (diff) | |
| download | gdk-pixbuf-de985fb58e80be74a181fee5e6f2d85d390c9140.tar.gz | |
Remove change check for GTK_TYPE_OBJECT derivation to G_TYPE_OBJECTS -
Sat Jun 30 20:44:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtktypeutils.c (gtk_type_class): Remove
change check for GTK_TYPE_OBJECT derivation to
G_TYPE_OBJECTS - it's Tim-approved to use this
for arbitary objects.
* gtk/gtkwindow.c gtk/gtkcontainer.[ch]: underscore
prefix gtk_container_dequeue_resize_handler().
* gtk/gtkwidget.[ch]: Add a previous_toplevel argument
to the hierarachy_changed signal, since you otherwise
have to always keep that around.
* gtk/gtkmenubar.c gtk/gtklabel.c gtk/gtksocket.c: Adapt
for extra argument to hierarchy_changed.
Diffstat (limited to 'gtk/gtksocket.c')
| -rw-r--r-- | gtk/gtksocket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 77d391b29..f28310bcc 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -46,7 +46,8 @@ static void gtk_socket_size_request (GtkWidget *widget GtkRequisition *requisition); static void gtk_socket_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static void gtk_socket_hierarchy_changed (GtkWidget *widget); +static void gtk_socket_hierarchy_changed (GtkWidget *widget, + GtkWidget *old_toplevel); static void gtk_socket_grab_notify (GtkWidget *widget, gboolean was_grabbed); static gboolean gtk_socket_key_press_event (GtkWidget *widget, @@ -541,7 +542,8 @@ toplevel_focus_out_handler (GtkWidget *toplevel, } static void -gtk_socket_hierarchy_changed (GtkWidget *widget) +gtk_socket_hierarchy_changed (GtkWidget *widget, + GtkWidget *old_toplevel) { GtkSocket *socket = GTK_SOCKET (widget); GtkWidget *toplevel = gtk_widget_get_toplevel (widget); |