From e7d4a7f90d58e7e45bf690107b3615135ced357e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 9 Mar 2001 13:28:26 +0000 Subject: Document expose event->region change and that gtk_widget_event doesn't 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: Document expose event->region change and that gtk_widget_event doesn't allow passing expose events. * gdk/gdkevents.h: Add region to expose event. * gdk/gdkevents.c: Handle event->region in gdk_event_copy() and gdk_event_free(). * gdk/gdkwindow.c (gdk_window_process_updates_internal): Generate expose_event->region when creating expose events. * gdk/x11/gdkevents-x11.c: Generate expose events with regions when translating X events. * gtk/gtkcontainer.[ch]: Default expose handler that propagates expose events to NO_WINDOW children. New function gtk_container_propagate_expose() * gtk/gtkwidget.[ch]: Moved gtk_widget_event implementation to gtk_widget_event_internal. gtk_widget_event calls gtk_widget_event_internal but doesn't allow expose events. New function gtk_widget_send_expose() to send expose events. New function gtk_widget_region_intersect() to calculate window/region intersections. * gtk/gtkmain.c (gtk_main_do_event): Use gdk_window_begin_paint_region() instead of gdk_window_begin_paint_rect(). Use gtk_widget_send_expose() to send expose events. * gtk/gtkbin.c: * gtk/gtkbox.c: * gtk/gtkfixed.c: * gtk/gtkimagemenuitem.c: * gtk/gtklist.c: * gtk/gtkpacker.c: * gtk/gtktable.c: * gtk/gtktree.c: Remove expose handler, using the default container implementation instead. * gtk/gtkbutton.c: * gtk/gtkcheckbutton.c: * gtk/gtkeventbox.c: * gtk/gtkfixed.c: * gtk/gtkhandlebox.c: * gtk/gtklayout.c: * gtk/gtklistitem.c: * gtk/gtkmenu.c: * gtk/gtkmenubar.c: * gtk/gtkmenuitem.c: * gtk/gtknotebook.c: * gtk/gtkoptionmenu.c: * gtk/gtkpaned.c: * gtk/gtkscrolledwindow.c: * gtk/gtktogglebutton.c: * gtk/gtktoolbar.c: * gtk/gtktreeitem.c: * gtk/gtkviewport.c: Chain expose handler to parent class handler. Use gtk_container_propagate_expose() to propagate exposes. * gtk/gtkclist.c (check_exposures): * gtk/gtktext.c (process_exposes): Use gtk_widget_send_expose instead of gtk_widget_event. --- gtk/gtkframe.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'gtk/gtkframe.c') diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index be0ea1713..76c35bf22 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -399,6 +399,7 @@ gtk_frame_paint (GtkWidget *widget, x2 = widget->style->xthickness + (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_SIDE_PAD; + gtk_paint_shadow_gap (widget->style, widget->window, GTK_STATE_NORMAL, frame->shadow_type, area, widget, "frame", @@ -418,27 +419,11 @@ static gboolean gtk_frame_expose (GtkWidget *widget, GdkEventExpose *event) { - GtkBin *bin = GTK_BIN (widget); - GtkFrame *frame = GTK_FRAME (widget); - GdkEventExpose child_event; - if (GTK_WIDGET_DRAWABLE (widget)) { gtk_frame_paint (widget, &event->area); - if (bin->child && GTK_WIDGET_NO_WINDOW (bin->child)) - { - child_event = *event; - if (gtk_widget_intersect (bin->child, &event->area, &child_event.area)) - gtk_widget_event (bin->child, (GdkEvent*) &child_event); - } - - if (frame->label_widget && GTK_WIDGET_NO_WINDOW (frame->label_widget)) - { - child_event = *event; - if (gtk_widget_intersect (frame->label_widget, &event->area, &child_event.area)) - gtk_widget_event (frame->label_widget, (GdkEvent*) &child_event); - } + (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); } return FALSE; -- cgit v1.2.1