forked from AuroraMiddleware/gtk
698c89e5c4
Thu Sep 3 04:22:20 1998 Tim Janik <timj@gtk.org> * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): GTK_MENU_DIR_CHILD: check for the existance of menu_shell->active_menu_item before accessing its child. GTK_MENU_DIR_PREV: GTK_MENU_DIR_NEXT: if we haven't had an active item and still don't, make a default selection. Wed Sep 2 00:28:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (gtk_widget_propagate_state): iterate the children with _forall for sensitivity changes and with _foreach on pure state changes. this fixes a lot of the old inclusions of internal widgets into _foreach calls. * gtk/gtktree.c: removed gtk_tree_foreach, let gtk_tree_forall do the work. don't walk the subtrees of first level children. * gtk/gtktreeitem.c: provide a _forall implementation, which walks the subtrees as well for include_internals. * gtk/gtkmenuitem.c: provide a _forall implementation, which walks the submenus as well for include_internals. * gtk/gtkscrolledwindow.c: removed gtk_scrolled_window_foreach and implemented gtk_scrolled_window_forall, which will iterate over the viewport and the scrollbars for gtk_container_forall or iterate over the viewports children for gtk_container_foreach. * gtk/gtktoolbar.c: * gtk/gtktable.c: * gtk/gtkpaned.c: * gtk/gtkpacker.c: * gtk/gtkmenushell.c: * gtk/gtklist.c: * gtk/gtkfixed.c: * gtk/gtkclist.c: * gtk/gtkbox.c: * gtk/gtkbin.c: * gtk/gtknotebook.c: removed the old gtk_*_foreach functions and provided gtk_*_forall. * gtk/gtknotebook.c: (gtk_notebook_real_switch_page): expose tabs. (gtk_notebook_page_num): new function to return the page number of a distinct child. (gtk_notebook_focus): minor fixups. foxus handling is still screwed under some circumstances. * gtk/gtktreeitem.c: (gtk_real_tree_item_select): (gtk_real_tree_item_deselect): major fixes. some general fixups wrt queue_redraw, and tree items not being NO_WINDOW widgets. * gtk/gtklistitem.c: (gtk_real_list_item_select): (gtk_real_list_item_deselect): (gtk_real_list_item_toggle): removed unneccessary queue_redraw calls. Wed Aug 30 09:42:07 1998 Tim Janik <timj@gtk.org> * gtk/gtkoptionmenu.c: allow optionmenus to have the focus and automatically popup the menu on space bar. Wed Aug 26 06:40:34 1998 Tim Janik <timj@gtk.org> * gtk/gtkcontainer.h: * gtk/gtkcontainer.c: implemented gtk_container_forall() (as a class method), which acts similar to gtk_container_foreach(), but iterates over internal children. the GtkContainer::foreach signal vanished in favour of a new class method ->forall() that optionally includes internal widgets. * gtk/gtkclist.c (gtk_clist_init): provide no _foreach implementation but a _forall implementation, since all child widgets we have are internal ones. (column_button_create): set the parent window prior to gtk_widget_set_parent(). * gtk/gtkwidget.c: exchanged all calls to gtk_container_foreach() with gtk_container_forall(). * gtk/gtkwidget.h: * gtk/gtkwidget.c: added the GTK_COMPOSITE_CHILD, exported through the GtkWidget::composite_child argument. to have a widget created with the flag initially, two new functions got added to wrap a widgets creation: gtk_widget_push_composite_flag() and gtk_widget_pop_composite_flag(). Wed Aug 25 23:37:39 1998 Tim Janik <timj@gtk.org> * gtk/gtktooltips.h: * gtk/gtktooltips.c: exported gtk_tooltips_create_window() as gtk_tooltips_force_window(), so tooltips->tip_window can be accessed prior to the first tip being set. don't put an extra reference on the window, since it is a toplevel, it wont get destroyed from anywhere else. * overall macro and GtkType fixups.
281 lines
7.0 KiB
C
281 lines
7.0 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)
|
|
{
|
|
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 (!GTK_WIDGET_NO_WINDOW (widget))
|
|
gdk_window_show (widget->window);
|
|
else
|
|
gtk_widget_queue_draw (widget);
|
|
|
|
if (bin->child &&
|
|
GTK_WIDGET_VISIBLE (bin->child) &&
|
|
!GTK_WIDGET_MAPPED (bin->child))
|
|
gtk_widget_map (bin->child);
|
|
}
|
|
|
|
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))
|
|
gdk_window_clear_area (widget->window,
|
|
widget->allocation.x,
|
|
widget->allocation.y,
|
|
widget->allocation.width,
|
|
widget->allocation.height);
|
|
else
|
|
gdk_window_hide (widget->window);
|
|
|
|
if (bin->child &&
|
|
GTK_WIDGET_VISIBLE (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));
|
|
|
|
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
|
|
{
|
|
bin = GTK_BIN (widget);
|
|
|
|
if (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);
|
|
}
|