Use GtkWindow* as first signal argument (was GtkWidget*).

2001-11-03  Daniel Elstner  <daniel.elstner@gmx.net>

	* 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.
This commit is contained in:
Daniel Elstner 2001-11-03 23:02:40 +00:00 committed by Daniel Elstner
parent 2a0f4e7d9a
commit ac81252161
10 changed files with 79 additions and 9 deletions

View File

@ -1,3 +1,13 @@
2001-11-03 Daniel Elstner <daniel.elstner@gmx.net>
* 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 <hans@breuer.org>
* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain

View File

@ -1,3 +1,13 @@
2001-11-03 Daniel Elstner <daniel.elstner@gmx.net>
* 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 <hans@breuer.org>
* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain

View File

@ -1,3 +1,13 @@
2001-11-03 Daniel Elstner <daniel.elstner@gmx.net>
* 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 <hans@breuer.org>
* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain

View File

@ -1,3 +1,13 @@
2001-11-03 Daniel Elstner <daniel.elstner@gmx.net>
* 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 <hans@breuer.org>
* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain

View File

@ -1,3 +1,13 @@
2001-11-03 Daniel Elstner <daniel.elstner@gmx.net>
* 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 <hans@breuer.org>
* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain

View File

@ -1,3 +1,13 @@
2001-11-03 Daniel Elstner <daniel.elstner@gmx.net>
* 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 <hans@breuer.org>
* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain

View File

@ -1,3 +1,13 @@
2001-11-03 Daniel Elstner <daniel.elstner@gmx.net>
* 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 <hans@breuer.org>
* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain

View File

@ -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);

View File

@ -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;

View File

@ -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 */