forked from AuroraMiddleware/gtk
2e99e7713d
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.
270 lines
6.7 KiB
C
270 lines
6.7 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
#include "gtkbin.h"
|
|
|
|
|
|
static void gtk_bin_class_init (GtkBinClass *klass);
|
|
static void gtk_bin_init (GtkBin *bin);
|
|
static void gtk_bin_map (GtkWidget *widget);
|
|
static void gtk_bin_unmap (GtkWidget *widget);
|
|
static void gtk_bin_draw (GtkWidget *widget,
|
|
GdkRectangle *area);
|
|
static gint gtk_bin_expose (GtkWidget *widget,
|
|
GdkEventExpose *event);
|
|
static void gtk_bin_add (GtkContainer *container,
|
|
GtkWidget *widget);
|
|
static void gtk_bin_remove (GtkContainer *container,
|
|
GtkWidget *widget);
|
|
static void gtk_bin_forall (GtkContainer *container,
|
|
gboolean include_internals,
|
|
GtkCallback callback,
|
|
gpointer callback_data);
|
|
static GtkType gtk_bin_child_type (GtkContainer*container);
|
|
|
|
|
|
static GtkContainerClass *parent_class = NULL;
|
|
|
|
|
|
GtkType
|
|
gtk_bin_get_type (void)
|
|
{
|
|
static guint bin_type = 0;
|
|
|
|
if (!bin_type)
|
|
{
|
|
static const GtkTypeInfo bin_info =
|
|
{
|
|
"GtkBin",
|
|
sizeof (GtkBin),
|
|
sizeof (GtkBinClass),
|
|
(GtkClassInitFunc) gtk_bin_class_init,
|
|
(GtkObjectInitFunc) gtk_bin_init,
|
|
/* reserved_1 */ NULL,
|
|
/* reserved_2 */ NULL,
|
|
(GtkClassInitFunc) NULL,
|
|
};
|
|
|
|
bin_type = gtk_type_unique (GTK_TYPE_CONTAINER, &bin_info);
|
|
}
|
|
|
|
return bin_type;
|
|
}
|
|
|
|
static void
|
|
gtk_bin_class_init (GtkBinClass *class)
|
|
{
|
|
GtkObjectClass *object_class;
|
|
GtkWidgetClass *widget_class;
|
|
GtkContainerClass *container_class;
|
|
|
|
object_class = (GtkObjectClass*) class;
|
|
widget_class = (GtkWidgetClass*) class;
|
|
container_class = (GtkContainerClass*) class;
|
|
|
|
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
|
|
|
|
widget_class->map = gtk_bin_map;
|
|
widget_class->unmap = gtk_bin_unmap;
|
|
widget_class->draw = gtk_bin_draw;
|
|
widget_class->expose_event = gtk_bin_expose;
|
|
|
|
container_class->add = gtk_bin_add;
|
|
container_class->remove = gtk_bin_remove;
|
|
container_class->forall = gtk_bin_forall;
|
|
container_class->child_type = gtk_bin_child_type;
|
|
}
|
|
|
|
static void
|
|
gtk_bin_init (GtkBin *bin)
|
|
{
|
|
GTK_WIDGET_SET_FLAGS (bin, GTK_NO_WINDOW);
|
|
|
|
bin->child = NULL;
|
|
}
|
|
|
|
|
|
static GtkType
|
|
gtk_bin_child_type (GtkContainer *container)
|
|
{
|
|
if (!GTK_BIN (container)->child)
|
|
return GTK_TYPE_WIDGET;
|
|
else
|
|
return GTK_TYPE_NONE;
|
|
}
|
|
|
|
static void
|
|
gtk_bin_map (GtkWidget *widget)
|
|
{
|
|
GtkBin *bin;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_BIN (widget));
|
|
|
|
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
|
|
bin = GTK_BIN (widget);
|
|
|
|
if (bin->child &&
|
|
GTK_WIDGET_VISIBLE (bin->child) &&
|
|
!GTK_WIDGET_MAPPED (bin->child))
|
|
gtk_widget_map (bin->child);
|
|
|
|
if (!GTK_WIDGET_NO_WINDOW (widget))
|
|
gdk_window_show (widget->window);
|
|
}
|
|
|
|
static void
|
|
gtk_bin_unmap (GtkWidget *widget)
|
|
{
|
|
GtkBin *bin;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_BIN (widget));
|
|
|
|
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
|
|
bin = GTK_BIN (widget);
|
|
|
|
if (GTK_WIDGET_NO_WINDOW (widget))
|
|
gtk_widget_queue_clear (widget);
|
|
else
|
|
gdk_window_hide (widget->window);
|
|
|
|
if (bin->child && GTK_WIDGET_MAPPED (bin->child))
|
|
gtk_widget_unmap (bin->child);
|
|
}
|
|
|
|
static void
|
|
gtk_bin_draw (GtkWidget *widget,
|
|
GdkRectangle *area)
|
|
{
|
|
GtkBin *bin;
|
|
GdkRectangle child_area;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_BIN (widget));
|
|
|
|
bin = GTK_BIN (widget);
|
|
|
|
if (bin->child && GTK_WIDGET_VISIBLE (bin->child) &&
|
|
gtk_widget_intersect (bin->child, area, &child_area))
|
|
gtk_widget_draw (bin->child, &child_area);
|
|
}
|
|
|
|
static gint
|
|
gtk_bin_expose (GtkWidget *widget,
|
|
GdkEventExpose *event)
|
|
{
|
|
GtkBin *bin;
|
|
GdkEventExpose child_event;
|
|
|
|
g_return_val_if_fail (widget != NULL, FALSE);
|
|
g_return_val_if_fail (GTK_IS_BIN (widget), FALSE);
|
|
g_return_val_if_fail (event != NULL, FALSE);
|
|
|
|
if (GTK_WIDGET_DRAWABLE (widget))
|
|
{
|
|
bin = GTK_BIN (widget);
|
|
|
|
child_event = *event;
|
|
if (bin->child &&
|
|
GTK_WIDGET_NO_WINDOW (bin->child) &&
|
|
gtk_widget_intersect (bin->child, &event->area, &child_event.area))
|
|
gtk_widget_event (bin->child, (GdkEvent*) &child_event);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
static void
|
|
gtk_bin_add (GtkContainer *container,
|
|
GtkWidget *child)
|
|
{
|
|
GtkBin *bin;
|
|
|
|
g_return_if_fail (container != NULL);
|
|
g_return_if_fail (GTK_IS_BIN (container));
|
|
g_return_if_fail (child != NULL);
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
|
|
|
bin = GTK_BIN (container);
|
|
g_return_if_fail (bin->child == NULL);
|
|
|
|
gtk_widget_set_parent (child, GTK_WIDGET (bin));
|
|
bin->child = child;
|
|
|
|
if (GTK_WIDGET_VISIBLE (child->parent))
|
|
{
|
|
if (GTK_WIDGET_REALIZED (child->parent) &&
|
|
!GTK_WIDGET_REALIZED (child))
|
|
gtk_widget_realize (child);
|
|
|
|
if (GTK_WIDGET_MAPPED (child->parent) &&
|
|
!GTK_WIDGET_MAPPED (child))
|
|
gtk_widget_map (child);
|
|
}
|
|
|
|
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (container))
|
|
gtk_widget_queue_resize (child);
|
|
}
|
|
|
|
static void
|
|
gtk_bin_remove (GtkContainer *container,
|
|
GtkWidget *child)
|
|
{
|
|
GtkBin *bin;
|
|
gboolean widget_was_visible;
|
|
|
|
g_return_if_fail (container != NULL);
|
|
g_return_if_fail (GTK_IS_BIN (container));
|
|
g_return_if_fail (child != NULL);
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
|
|
|
bin = GTK_BIN (container);
|
|
g_return_if_fail (bin->child == child);
|
|
|
|
widget_was_visible = GTK_WIDGET_VISIBLE (child);
|
|
|
|
gtk_widget_unparent (child);
|
|
bin->child = NULL;
|
|
|
|
/* queue resize regardless of GTK_WIDGET_VISIBLE (container),
|
|
* since that's what is needed by toplevels, which derive from GtkBin.
|
|
*/
|
|
if (widget_was_visible)
|
|
gtk_widget_queue_resize (GTK_WIDGET (container));
|
|
}
|
|
|
|
static void
|
|
gtk_bin_forall (GtkContainer *container,
|
|
gboolean include_internals,
|
|
GtkCallback callback,
|
|
gpointer callback_data)
|
|
{
|
|
GtkBin *bin;
|
|
|
|
g_return_if_fail (container != NULL);
|
|
g_return_if_fail (GTK_IS_BIN (container));
|
|
g_return_if_fail (callback != NULL);
|
|
|
|
bin = GTK_BIN (container);
|
|
|
|
if (bin->child)
|
|
(* callback) (bin->child, callback_data);
|
|
}
|