nparams for selection_get should be 3, not 2. [ From Damon Chaplin
Fri Jan 15 10:22:21 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_class_init): nparams for selection_get should be 3, not 2. [ From Damon Chaplin <damon@karuna.freeserve.co.uk> ] * gtk/gtkeventbox.c (gtk_event_box_paint): Add a paint routine so queued redraws work inside event boxes. Thu Jan 14 17:47:37 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): Only redraw character under cursor when not displaying highlighted selection. * gdk/gdkrgb.c (gdk_rgb_init): Add in a cast to gpointer to make IRIX cc happy. Thu Jan 14 12:29:50 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkcheckbutton.c (gtk_check_button_draw): Restructure the drawing code to remove a bit of duplication - and to remove a call to gtk_widget_draw_focus() that queues a redraw when an expose occurs. * gtk/gtklabel.c (gtk_label_expose): Fix up handling of ypadding. * gtk/gtknotebook.c (gtk_notebook_draw): If we redraw the whole widget, also redraw the corresponding areas of the child widget. (have_visible_child still has some problems) * gdk/gdkpixmap.c: Change some g_new's to g_new0 so that fields unused for pixmaps get initialzized sanely. * gdk/gdk.h gdk/gdkwindow.c gdk/gdkprivate.h: Add new calls gdk_window_is_visible() and gdk_window_is_viewable() and a mapped flag to the window private structure. * gtk/gtkbin.c gtk/gtkclist.c gtk/gtkfixed.c gtk/gtkitem.c gtk/gtklayout.c gtk/gtklist.c gtk/gtkmenushell.c gtk/gtknotebook.c gtk/gtkpaned.c gtk/gtktree.c gtk/gtktreeitem.c gtk/gtkviewport.c: Map windows after mapping children. * gtk/gtkwidget.c (gtk_widget_clip_rect): Handle rectangles completely clipped away correctly. * gtk/gtkwidget.c (gtk_widget_idle_draw): Don't call gtk_widget_draw if width or height is 0. * gtk/gtkwidget.c (gtk_widget_idle_draw): Don't rely on GTK_REDRAW_PENDING after we've cleared it. (This was causing draw-combining to not happen at all). * gtk/gtkbin.c gtk/gtkscale.c: Remove uneccessary calls to gtk_widget_queue_draw() when mapping.
This commit is contained in:
@ -477,7 +477,6 @@ gtk_notebook_map (GtkWidget *widget)
|
||||
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
|
||||
|
||||
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
|
||||
gdk_window_show (widget->window);
|
||||
|
||||
notebook = GTK_NOTEBOOK (widget);
|
||||
|
||||
@ -503,6 +502,8 @@ gtk_notebook_map (GtkWidget *widget)
|
||||
gtk_widget_map (page->tab_label);
|
||||
}
|
||||
}
|
||||
|
||||
gdk_window_show (widget->window);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -878,6 +879,7 @@ gtk_notebook_draw (GtkWidget *widget,
|
||||
{
|
||||
GtkNotebook *notebook;
|
||||
GdkRectangle child_area;
|
||||
GdkRectangle draw_area;
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
|
||||
@ -885,6 +887,8 @@ gtk_notebook_draw (GtkWidget *widget,
|
||||
|
||||
notebook = GTK_NOTEBOOK (widget);
|
||||
|
||||
draw_area = *area;
|
||||
|
||||
if (GTK_WIDGET_DRAWABLE (widget))
|
||||
{
|
||||
gboolean have_visible_child;
|
||||
@ -893,22 +897,19 @@ gtk_notebook_draw (GtkWidget *widget,
|
||||
|
||||
if (have_visible_child != notebook->have_visible_child)
|
||||
{
|
||||
GdkRectangle full_area;
|
||||
|
||||
notebook->have_visible_child = have_visible_child;
|
||||
full_area.x = 0;
|
||||
full_area.y = 0;
|
||||
full_area.width = widget->allocation.width;
|
||||
full_area.height = widget->allocation.height;
|
||||
gtk_notebook_paint (widget, &full_area);
|
||||
draw_area.x = 0;
|
||||
draw_area.y = 0;
|
||||
draw_area.width = widget->allocation.width;
|
||||
draw_area.height = widget->allocation.height;
|
||||
}
|
||||
else
|
||||
gtk_notebook_paint (widget, area);
|
||||
|
||||
gtk_notebook_paint (widget, &draw_area);
|
||||
|
||||
gtk_widget_draw_focus (widget);
|
||||
|
||||
if (notebook->cur_page && GTK_WIDGET_VISIBLE (notebook->cur_page->child) &&
|
||||
gtk_widget_intersect (notebook->cur_page->child, area, &child_area))
|
||||
gtk_widget_intersect (notebook->cur_page->child, &draw_area, &child_area))
|
||||
gtk_widget_draw (notebook->cur_page->child, &child_area);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user