diff --git a/ChangeLog b/ChangeLog index 4c39f24707..8d4b6f85f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-11-03 Daniel Elstner + + * gtk/gtkwindow.h (frame_event): Use GtkWindow* as first + signal argument (was GtkWidget*). + + * gtk/gtkwindow.c (gtk_window_frame_event), + gtk/gtkwindow-decorate.c (gtk_decorated_window_frame_event): + Fixed argument types as above, removed GTK_WINDOW casts and + added some GTK_WIDGET casts instead. + 2001-11-03 Hans Breuer * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4c39f24707..8d4b6f85f7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +2001-11-03 Daniel Elstner + + * gtk/gtkwindow.h (frame_event): Use GtkWindow* as first + signal argument (was GtkWidget*). + + * gtk/gtkwindow.c (gtk_window_frame_event), + gtk/gtkwindow-decorate.c (gtk_decorated_window_frame_event): + Fixed argument types as above, removed GTK_WINDOW casts and + added some GTK_WIDGET casts instead. + 2001-11-03 Hans Breuer * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4c39f24707..8d4b6f85f7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2001-11-03 Daniel Elstner + + * gtk/gtkwindow.h (frame_event): Use GtkWindow* as first + signal argument (was GtkWidget*). + + * gtk/gtkwindow.c (gtk_window_frame_event), + gtk/gtkwindow-decorate.c (gtk_decorated_window_frame_event): + Fixed argument types as above, removed GTK_WINDOW casts and + added some GTK_WIDGET casts instead. + 2001-11-03 Hans Breuer * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4c39f24707..8d4b6f85f7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +2001-11-03 Daniel Elstner + + * gtk/gtkwindow.h (frame_event): Use GtkWindow* as first + signal argument (was GtkWidget*). + + * gtk/gtkwindow.c (gtk_window_frame_event), + gtk/gtkwindow-decorate.c (gtk_decorated_window_frame_event): + Fixed argument types as above, removed GTK_WINDOW casts and + added some GTK_WIDGET casts instead. + 2001-11-03 Hans Breuer * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4c39f24707..8d4b6f85f7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +2001-11-03 Daniel Elstner + + * gtk/gtkwindow.h (frame_event): Use GtkWindow* as first + signal argument (was GtkWidget*). + + * gtk/gtkwindow.c (gtk_window_frame_event), + gtk/gtkwindow-decorate.c (gtk_decorated_window_frame_event): + Fixed argument types as above, removed GTK_WINDOW casts and + added some GTK_WIDGET casts instead. + 2001-11-03 Hans Breuer * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4c39f24707..8d4b6f85f7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2001-11-03 Daniel Elstner + + * gtk/gtkwindow.h (frame_event): Use GtkWindow* as first + signal argument (was GtkWidget*). + + * gtk/gtkwindow.c (gtk_window_frame_event), + gtk/gtkwindow-decorate.c (gtk_decorated_window_frame_event): + Fixed argument types as above, removed GTK_WINDOW casts and + added some GTK_WIDGET casts instead. + 2001-11-03 Hans Breuer * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4c39f24707..8d4b6f85f7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2001-11-03 Daniel Elstner + + * gtk/gtkwindow.h (frame_event): Use GtkWindow* as first + signal argument (was GtkWidget*). + + * gtk/gtkwindow.c (gtk_window_frame_event), + gtk/gtkwindow-decorate.c (gtk_decorated_window_frame_event): + Fixed argument types as above, removed GTK_WINDOW casts and + added some GTK_WIDGET casts instead. + 2001-11-03 Hans Breuer * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c index 080608ba78..2ef0c0d5bf 100644 --- a/gtk/gtkwindow-decorate.c +++ b/gtk/gtkwindow-decorate.c @@ -95,7 +95,7 @@ static void gtk_decorated_window_recalculate_regions (GtkWindow *windo static GtkWindowRegionType gtk_decorated_window_region_type (GtkWindow *window, gint x, gint y); -static gint gtk_decorated_window_frame_event (GtkWidget *widget, +static gint gtk_decorated_window_frame_event (GtkWindow *window, GdkEvent *event); static gint gtk_decorated_window_button_press (GtkWidget *widget, GdkEventButton *event); @@ -288,9 +288,10 @@ gtk_decorated_window_unrealize (GtkWindow *window) } static gint -gtk_decorated_window_frame_event (GtkWidget *widget, GdkEvent *event) +gtk_decorated_window_frame_event (GtkWindow *window, GdkEvent *event) { - GtkWindowDecoration *deco = get_decoration (GTK_WINDOW (widget)); + GtkWindowDecoration *deco = get_decoration (window); + GtkWidget *widget = GTK_WIDGET (window); GdkEventExpose *expose_event; switch (event->type) @@ -302,7 +303,7 @@ gtk_decorated_window_frame_event (GtkWidget *widget, GdkEvent *event) return TRUE; break; case GDK_CONFIGURE: - gtk_decorated_window_recalculate_regions (GTK_WINDOW (widget)); + gtk_decorated_window_recalculate_regions (window); break; case GDK_MOTION_NOTIFY: return gtk_decorated_window_motion_notify (widget, (GdkEventMotion *)event); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 86ea0b9bac..6bedb3aabe 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -144,7 +144,7 @@ static void gtk_window_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static gint gtk_window_event (GtkWidget *widget, GdkEvent *event); -static gboolean gtk_window_frame_event (GtkWidget *widget, +static gboolean gtk_window_frame_event (GtkWindow *window, GdkEvent *event); static gint gtk_window_configure_event (GtkWidget *widget, GdkEventConfigure *event); @@ -3283,10 +3283,9 @@ gtk_window_event (GtkWidget *widget, GdkEvent *event) } static gboolean -gtk_window_frame_event (GtkWidget *widget, GdkEvent *event) +gtk_window_frame_event (GtkWindow *window, GdkEvent *event) { GdkEventConfigure *configure_event; - GtkWindow *window = GTK_WINDOW (widget); GdkRectangle rect; switch (event->type) @@ -3305,7 +3304,7 @@ gtk_window_frame_event (GtkWidget *widget, GdkEvent *event) /* Pass on the (modified) configure event */ configure_event->width -= window->frame_left + window->frame_right; configure_event->height -= window->frame_top + window->frame_bottom; - return gtk_window_configure_event (widget, configure_event); + return gtk_window_configure_event (GTK_WIDGET (window), configure_event); break; default: break; diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index b98c20a6b3..57a8801810 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -115,7 +115,7 @@ struct _GtkWindowClass void (* set_focus) (GtkWindow *window, GtkWidget *focus); - gboolean (* frame_event) (GtkWidget *widget, + gboolean (* frame_event) (GtkWindow *window, GdkEvent *event); /* G_SIGNAL_ACTION signals for keybindings */