diff options
| -rw-r--r-- | gtk/gtktoolbar.c | 1207 |
1 files changed, 616 insertions, 591 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 4f10503df4..3bc43591c1 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -27,23 +27,25 @@ enum { - ORIENTATION_CHANGED, - STYLE_CHANGED, - LAST_SIGNAL + ORIENTATION_CHANGED, + STYLE_CHANGED, + LAST_SIGNAL }; -typedef enum { - CHILD_SPACE, - CHILD_BUTTON, - CHILD_WIDGET +typedef enum +{ + CHILD_SPACE, + CHILD_BUTTON, + CHILD_WIDGET } ChildType; -typedef struct { - ChildType type; - GtkWidget *widget; - GtkWidget *icon; - GtkWidget *label; +typedef struct +{ + ChildType type; + GtkWidget *widget; + GtkWidget *icon; + GtkWidget *label; } Child; @@ -89,791 +91,814 @@ static gint toolbar_signals[LAST_SIGNAL] = { 0 }; guint -gtk_toolbar_get_type(void) +gtk_toolbar_get_type (void) { - static guint toolbar_type = 0; - - if (!toolbar_type) { - GtkTypeInfo toolbar_info = { - "GtkToolbar", - sizeof(GtkToolbar), - sizeof(GtkToolbarClass), - (GtkClassInitFunc) gtk_toolbar_class_init, - (GtkObjectInitFunc) gtk_toolbar_init, - (GtkArgFunc) NULL - }; - - toolbar_type = gtk_type_unique(gtk_container_get_type(), &toolbar_info); - } - - return toolbar_type; + static guint toolbar_type = 0; + + if (!toolbar_type) + { + GtkTypeInfo toolbar_info = + { + "GtkToolbar", + sizeof (GtkToolbar), + sizeof (GtkToolbarClass), + (GtkClassInitFunc) gtk_toolbar_class_init, + (GtkObjectInitFunc) gtk_toolbar_init, + (GtkArgFunc) NULL + }; + + toolbar_type = gtk_type_unique (gtk_container_get_type (), &toolbar_info); + } + + return toolbar_type; } static void -gtk_toolbar_class_init(GtkToolbarClass *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_container_get_type()); - - toolbar_signals[ORIENTATION_CHANGED] = - gtk_signal_new("orientation_changed", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(GtkToolbarClass, orientation_changed), - gtk_toolbar_marshal_signal_1, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); - toolbar_signals[STYLE_CHANGED] = - gtk_signal_new("style_changed", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(GtkToolbarClass, style_changed), - gtk_toolbar_marshal_signal_1, - GTK_TYPE_NONE, 1, - GTK_TYPE_INT); - - gtk_object_class_add_signals(object_class, toolbar_signals, LAST_SIGNAL); - - object_class->destroy = gtk_toolbar_destroy; - - widget_class->map = gtk_toolbar_map; - widget_class->unmap = gtk_toolbar_unmap; - widget_class->draw = gtk_toolbar_draw; - widget_class->expose_event = gtk_toolbar_expose; - widget_class->size_request = gtk_toolbar_size_request; - widget_class->size_allocate = gtk_toolbar_size_allocate; - - container_class->add = gtk_toolbar_add; - container_class->remove = gtk_toolbar_remove; - container_class->foreach = gtk_toolbar_foreach; - - class->orientation_changed = gtk_real_toolbar_orientation_changed; - class->style_changed = gtk_real_toolbar_style_changed; +gtk_toolbar_class_init (GtkToolbarClass *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_container_get_type ()); + + toolbar_signals[ORIENTATION_CHANGED] = + gtk_signal_new ("orientation_changed", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed), + gtk_toolbar_marshal_signal_1, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT); + toolbar_signals[STYLE_CHANGED] = + gtk_signal_new ("style_changed", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed), + gtk_toolbar_marshal_signal_1, + GTK_TYPE_NONE, 1, + GTK_TYPE_INT); + + gtk_object_class_add_signals (object_class, toolbar_signals, LAST_SIGNAL); + + object_class->destroy = gtk_toolbar_destroy; + + widget_class->map = gtk_toolbar_map; + widget_class->unmap = gtk_toolbar_unmap; + widget_class->draw = gtk_toolbar_draw; + widget_class->expose_event = gtk_toolbar_expose; + widget_class->size_request = gtk_toolbar_size_request; + widget_class->size_allocate = gtk_toolbar_size_allocate; + + container_class->add = gtk_toolbar_add; + container_class->remove = gtk_toolbar_remove; + container_class->foreach = gtk_toolbar_foreach; + + class->orientation_changed = gtk_real_toolbar_orientation_changed; + class->style_changed = gtk_real_toolbar_style_changed; } static void -gtk_toolbar_init(GtkToolbar *toolbar) -{ - GTK_WIDGET_SET_FLAGS(toolbar, GTK_NO_WINDOW); - - toolbar->num_children = 0; - toolbar->children = NULL; - toolbar->orientation = GTK_ORIENTATION_HORIZONTAL; - toolbar->style = GTK_TOOLBAR_ICONS; - toolbar->space_size = DEFAULT_SPACE_SIZE; - toolbar->tooltips = gtk_tooltips_new(); - toolbar->button_maxw = 0; - toolbar->button_maxh = 0; +gtk_toolbar_init (GtkToolbar *toolbar) +{ + GTK_WIDGET_SET_FLAGS (toolbar, GTK_NO_WINDOW); + + toolbar->num_children = 0; + toolbar->children = NULL; + toolbar->orientation = GTK_ORIENTATION_HORIZONTAL; + toolbar->style = GTK_TOOLBAR_ICONS; + toolbar->space_size = DEFAULT_SPACE_SIZE; + toolbar->tooltips = gtk_tooltips_new (); + toolbar->button_maxw = 0; + toolbar->button_maxh = 0; } GtkWidget * -gtk_toolbar_new(GtkOrientation orientation, - GtkToolbarStyle style) +gtk_toolbar_new (GtkOrientation orientation, + GtkToolbarStyle style) { - GtkToolbar *toolbar; + GtkToolbar *toolbar; - toolbar = gtk_type_new(gtk_toolbar_get_type()); + toolbar = gtk_type_new (gtk_toolbar_get_type ()); - toolbar->orientation = orientation; - toolbar->style = style; + toolbar->orientation = orientation; + toolbar->style = style; - return GTK_WIDGET(toolbar); + return GTK_WIDGET (toolbar); } - static void -gtk_toolbar_destroy(GtkObject *object) +gtk_toolbar_destroy (GtkObject *object) { - GtkToolbar *toolbar; - GList *children; - Child *child; + GtkToolbar *toolbar; + GList *children; + Child *child; - g_return_if_fail(object != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(object)); + g_return_if_fail (object != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (object)); - toolbar = GTK_TOOLBAR(object); + toolbar = GTK_TOOLBAR (object); - gtk_tooltips_unref(toolbar->tooltips); + gtk_tooltips_unref (toolbar->tooltips); - for (children = toolbar->children; children; children = children->next) { - child = children->data; + for (children = toolbar->children; children; children = children->next) + { + child = children->data; - if (child->type != CHILD_SPACE) { - child->widget->parent = NULL; - gtk_object_unref(GTK_OBJECT(child->widget)); - gtk_widget_destroy(child->widget); - } - - g_free(child); + if (child->type != CHILD_SPACE) + { + child->widget->parent = NULL; + gtk_object_unref (GTK_OBJECT (child->widget)); + gtk_widget_destroy (child->widget); } - g_list_free(toolbar->children); + g_free (child); + } + + g_list_free (toolbar->children); - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object); + if (GTK_OBJECT_CLASS (parent_class)->destroy) + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } static void -gtk_toolbar_map(GtkWidget *widget) +gtk_toolbar_map (GtkWidget *widget) { - GtkToolbar *toolbar; - GList *children; - Child *child; + GtkToolbar *toolbar; + GList *children; + Child *child; - g_return_if_fail(widget != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(widget)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (widget)); - toolbar = GTK_TOOLBAR(widget); - GTK_WIDGET_SET_FLAGS(toolbar, GTK_MAPPED); + toolbar = GTK_TOOLBAR (widget); + GTK_WIDGET_SET_FLAGS (toolbar, GTK_MAPPED); - for (children = toolbar->children; children; children = children->next) { - child = children->data; + for (children = toolbar->children; children; children = children->next) + { + child = children->data; - if ((child->type != CHILD_SPACE) - && GTK_WIDGET_VISIBLE(child->widget) && !GTK_WIDGET_MAPPED(child->widget)) - gtk_widget_map(child->widget); - } + if ((child->type != CHILD_SPACE) + && GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget)) + gtk_widget_map (child->widget); + } } static void -gtk_toolbar_unmap(GtkWidget *widget) +gtk_toolbar_unmap (GtkWidget *widget) { - GtkToolbar *toolbar; - GList *children; - Child *child; + GtkToolbar *toolbar; + GList *children; + Child *child; - g_return_if_fail(widget != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(widget)); - - toolbar = GTK_TOOLBAR(widget); - GTK_WIDGET_UNSET_FLAGS(toolbar, GTK_MAPPED); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (widget)); - for (children = toolbar->children; children; children = children->next) { - child = children->data; + toolbar = GTK_TOOLBAR (widget); + GTK_WIDGET_UNSET_FLAGS (toolbar, GTK_MAPPED); - if ((child->type != CHILD_SPACE) - && GTK_WIDGET_VISIBLE(child->widget) && GTK_WIDGET_MAPPED(child->widget)) - gtk_widget_unmap(child->widget); - } + for (children = toolbar->children; children; children = children->next) + { + child = children->data; + + if ((child->type != CHILD_SPACE) + && GTK_WIDGET_VISIBLE (child->widget) && GTK_WIDGET_MAPPED (child->widget)) + gtk_widget_unmap (child->widget); + } } static void -gtk_toolbar_draw(GtkWidget *widget, - GdkRectangle *area) +gtk_toolbar_draw (GtkWidget *widget, + GdkRectangle *area) { - GtkToolbar *toolbar; - GList *children; - Child *child; - GdkRectangle child_area; + GtkToolbar *toolbar; + GList *children; + Child *child; + GdkRectangle child_area; - g_return_if_fail(widget != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(widget)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (widget)); - if (GTK_WIDGET_DRAWABLE(widget)) { - toolbar = GTK_TOOLBAR(widget); + if (GTK_WIDGET_DRAWABLE (widget)) + { + toolbar = GTK_TOOLBAR (widget); - for (children = toolbar->children; children; children = children->next) { - child = children->data; + for (children = toolbar->children; children; children = children->next) + { + child = children->data; - if ((child->type != CHILD_SPACE) - && gtk_widget_intersect(child->widget, area, &child_area)) - gtk_widget_draw(child->widget, &child_area); - } + if ((child->type != CHILD_SPACE) + && gtk_widget_intersect (child->widget, area, &child_area)) + gtk_widget_draw (child->widget, &child_area); } + } } static gint -gtk_toolbar_expose(GtkWidget *widget, - GdkEventExpose *event) +gtk_toolbar_expose (GtkWidget *widget, + GdkEventExpose *event) { - GtkToolbar *toolbar; - GList *children; - Child *child; - GdkEventExpose child_event; + GtkToolbar *toolbar; + GList *children; + Child *child; + GdkEventExpose child_event; - g_return_val_if_fail(widget != NULL, FALSE); - g_return_val_if_fail(GTK_IS_TOOLBAR(widget), FALSE); - g_return_val_if_fail(event != NULL, FALSE); + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GTK_IS_TOOLBAR (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); - if (GTK_WIDGET_DRAWABLE(widget)) { - toolbar = GTK_TOOLBAR(widget); + if (GTK_WIDGET_DRAWABLE (widget)) + { + toolbar = GTK_TOOLBAR (widget); - child_event = *event; + child_event = *event; - for (children = toolbar->children; children; children = children->next) { - child = children->data; + for (children = toolbar->children; children; children = children->next) + { + child = children->data; - if ((child->type != CHILD_SPACE) - && GTK_WIDGET_NO_WINDOW(child->widget) - && gtk_widget_intersect(child->widget, &event->area, &child_event.area)) - gtk_widget_event(child->widget, (GdkEvent *) &child_event); - } + if ((child->type != CHILD_SPACE) + && GTK_WIDGET_NO_WINDOW (child->widget) + && gtk_widget_intersect (child->widget, &event->area, &child_event.area)) + gtk_widget_event (child->widget, (GdkEvent *) &child_event); } + } - return FALSE; + return FALSE; } static void -gtk_toolbar_size_request(GtkWidget *widget, - GtkRequisition *requisition) -{ - GtkToolbar *toolbar; - GList *children; - Child *child; - gint nbuttons; - gint button_maxw, button_maxh; - gint widget_maxw, widget_maxh; - - g_return_if_fail(widget != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(widget)); - g_return_if_fail(requisition != NULL); - - toolbar = GTK_TOOLBAR(widget); - - requisition->width = GTK_CONTAINER(toolbar)->border_width * 2; - requisition->height = GTK_CONTAINER(toolbar)->border_width * 2; - nbuttons = 0; - button_maxw = 0; - button_maxh = 0; - widget_maxw = 0; - widget_maxh = 0; - - for (children = toolbar->children; children; children = children->next) { - child = children->data; - - switch (child->type) { - case CHILD_SPACE: - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - requisition->width += toolbar->space_size; - else - requisition->height += toolbar->space_size; - - break; - - case CHILD_BUTTON: - if (GTK_WIDGET_VISIBLE(child->widget)) { - gtk_widget_size_request(child->widget, &child->widget->requisition); - - nbuttons++; - button_maxw = MAX(button_maxw, child->widget->requisition.width); - button_maxh = MAX(button_maxh, child->widget->requisition.height); - } - - break; - - case CHILD_WIDGET: - if (GTK_WIDGET_VISIBLE(child->widget)) { - gtk_widget_size_request(child->widget, &child->widget->requisition); - - widget_maxw = MAX(widget_maxw, child->widget->requisition.width); - widget_maxh = MAX(widget_maxh, child->widget->requisition.height); - - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - requisition->width += child->widget->requisition.width; - else - requisition->height += child->widget->requisition.height; - } - - break; - - default: - g_assert_not_reached(); - } - } - - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) { - requisition->width += nbuttons * button_maxw; - requisition->height += MAX(button_maxh, widget_maxh); - } else { - requisition->width += MAX(button_maxw, widget_maxw); - requisition->height += nbuttons * button_maxh; +gtk_toolbar_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + GtkToolbar *toolbar; + GList *children; + Child *child; + gint nbuttons; + gint button_maxw, button_maxh; + gint widget_maxw, widget_maxh; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (widget)); + g_return_if_fail (requisition != NULL); + + toolbar = GTK_TOOLBAR (widget); + + requisition->width = GTK_CONTAINER (toolbar)->border_width * 2; + requisition->height = GTK_CONTAINER (toolbar)->border_width * 2; + nbuttons = 0; + button_maxw = 0; + button_maxh = 0; + widget_maxw = 0; + widget_maxh = 0; + + for (children = toolbar->children; children; children = children->next) + { + child = children->data; + + switch (child->type) + { + case CHILD_SPACE: + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + requisition->width += toolbar->space_size; + else + requisition->height += toolbar->space_size; + + break; + + case CHILD_BUTTON: + if (GTK_WIDGET_VISIBLE (child->widget)) + { + gtk_widget_size_request (child->widget, &child->widget->requisition); + + nbuttons++; + button_maxw = MAX (button_maxw, child->widget->requisition.width); + button_maxh = MAX (button_maxh, child->widget->requisition.height); + } + + break; + + case CHILD_WIDGET: + if (GTK_WIDGET_VISIBLE (child->widget)) + { + gtk_widget_size_request (child->widget, &child->widget->requisition); + + widget_maxw = MAX (widget_maxw, child->widget->requisition.width); + widget_maxh = MAX (widget_maxh, child->widget->requisition.height); + + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + requisition->width += child->widget->requisition.width; + else + requisition->height += child->widget->requisition.height; + } + + break; + + default: + g_assert_not_reached (); } - - toolbar->button_maxw = button_maxw; - toolbar->button_maxh = button_maxh; + } + + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + { + requisition->width += nbuttons * button_maxw; + requisition->height += MAX (button_maxh, widget_maxh); + } + else + { + requisition->width += MAX (button_maxw, widget_maxw); + requisition->height += nbuttons * button_maxh; + } + + toolbar->button_maxw = button_maxw; + toolbar->button_maxh = button_maxh; } static void -gtk_toolbar_size_allocate(GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkToolbar *toolbar; - GList *children; - Child *child; - GtkAllocation alloc; - gint border_width; - - g_return_if_fail(widget != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(widget)); - g_return_if_fail(allocation != NULL); - - toolbar = GTK_TOOLBAR(widget); - widget->allocation = *allocation; - - border_width = GTK_CONTAINER(toolbar)->border_width; - - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - alloc.x = allocation->x + border_width; - else - alloc.y = allocation->y + border_width; - - for (children = toolbar->children; children; children = children->next) { - child = children->data; - - switch (child->type) { - case CHILD_SPACE: - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - alloc.x += toolbar->space_size; - else - alloc.y += toolbar->space_size; - - break; - - case CHILD_BUTTON: - alloc.width = toolbar->button_maxw; - alloc.height = toolbar->button_maxh; - - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - alloc.y = (allocation->y - + (allocation->height - toolbar->button_maxh) / 2); - else - alloc.x = (allocation->x - + (allocation->width - toolbar->button_maxw) / 2); - - gtk_widget_size_allocate(child->widget, &alloc); - - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - alloc.x += toolbar->button_maxw; - else - alloc.y += toolbar->button_maxh; - - break; - - case CHILD_WIDGET: - alloc.width = child->widget->requisition.width; - alloc.height = child->widget->requisition.height; - - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - alloc.y = (allocation->y - + (allocation->height - - child->widget->requisition.height) / 2); - else - alloc.x = (allocation->x - + (allocation->width - - child->widget->requisition.width) / 2); - - gtk_widget_size_allocate(child->widget, &alloc); - - if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) - alloc.x += child->widget->requisition.width; - else - alloc.y += child->widget->requisition.height; - - break; - - default: - g_assert_not_reached(); - } +gtk_toolbar_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GtkToolbar *toolbar; + GList *children; + Child *child; + GtkAllocation alloc; + gint border_width; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (widget)); + g_return_if_fail (allocation != NULL); + + toolbar = GTK_TOOLBAR (widget); + widget->allocation = *allocation; + + border_width = GTK_CONTAINER (toolbar)->border_width; + + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + alloc.x = allocation->x + border_width; + else + alloc.y = allocation->y + border_width; + + for (children = toolbar->children; children; children = children->next) + { + child = children->data; + + switch (child->type) + { + case CHILD_SPACE: + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + alloc.x += toolbar->space_size; + else + alloc.y += toolbar->space_size; + + break; + + case CHILD_BUTTON: + alloc.width = toolbar->button_maxw; + alloc.height = toolbar->button_maxh; + + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + alloc.y = allocation->y + (allocation->height - toolbar->button_maxh) / 2; + else + alloc.x = allocation->x + (allocation->width - toolbar->button_maxw) / 2; + + gtk_widget_size_allocate (child->widget, &alloc); + + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + alloc.x += toolbar->button_maxw; + else + alloc.y += toolbar->button_maxh; + + break; + + case CHILD_WIDGET: + alloc.width = child->widget->requisition.width; + alloc.height = child->widget->requisition.height; + + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + alloc.y = allocation->y + (allocation->height - child->widget->requisition.height) / 2; + else + alloc.x = allocation->x + (allocation->width - child->widget->requisition.width) / 2; + + gtk_widget_size_allocate (child->widget, &alloc); + + if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) + alloc.x += child->widget->requisition.width; + else + alloc.y += child->widget->requisition.height; + + break; + + default: + g_assert_not_reached (); } + } } static void -gtk_toolbar_add(GtkContainer *container, - GtkWidget *widget) -{ - g_return_if_fail(container != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(container)); - g_return_if_fail(widget != NULL); - - gtk_toolbar_append_widget(GTK_TOOLBAR(container), NULL, widget); +gtk_toolbar_add (GtkContainer *container, + GtkWidget *widget) +{ + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (container)); + g_return_if_fail (widget != NULL); + + gtk_toolbar_append_widget (GTK_TOOLBAR (container), NULL, widget); } static void -gtk_toolbar_remove(GtkContainer *container, - GtkWidget *widget) +gtk_toolbar_remove (GtkContainer *container, + GtkWidget *widget) { - GtkToolbar *toolbar; - GList *children; - Child *child; + GtkToolbar *toolbar; + GList *children; + Child *child; - g_return_if_fail(container != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(container)); - g_return_if_fail(widget != NULL); + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (container)); + g_return_if_fail (widget != NULL); - toolbar = GTK_TOOLBAR(container); + toolbar = GTK_TOOLBAR (container); - for (children = toolbar->children; children; children = children->next) { - child = children->data; + for (children = toolbar->children; children; children = children->next) + { + child = children->data; - if ((child->type != CHILD_SPACE) && (child->widget == widget)) { - gtk_widget_unparent(widget); + if ((child->type != CHILD_SPACE) && (child->widget == widget)) + { + gtk_widget_unparent (widget); - toolbar->children = g_list_remove_link(toolbar->children, children); - g_free(child); - g_list_free(children); - toolbar->num_children--; + toolbar->children = g_list_remove_link (toolbar->children, children); + g_free (child); + g_list_free (children); + toolbar->num_children--; - if (GTK_WIDGET_VISIBLE(widget) && GTK_WIDGET_VISIBLE(container)) - gtk_widget_queue_resize(GTK_WIDGET(container)); + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container)) + gtk_widget_queue_resize (GTK_WIDGET (container)); - break; - } + break; } + } } static void -gtk_toolbar_foreach(GtkContainer *container, - GtkCallback callback, - gpointer callback_data) +gtk_toolbar_foreach (GtkContainer *container, + GtkCallback callback, + gpointer callback_data) { - GtkToolbar *toolbar; - GList *children; - Child *child; + GtkToolbar *toolbar; + GList *children; + Child *child; - g_return_if_fail(container != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(container)); - g_return_if_fail(callback != NULL); + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (container)); + g_return_if_fail (callback != NULL); - toolbar = GTK_TOOLBAR(container); + toolbar = GTK_TOOLBAR (container); - for (children = toolbar->children; children; children = children->next) { - child = children->data; + for (children = toolbar->children; children; children = children->next) + { + child = children->data; - if (child->type != CHILD_SPACE) - (*callback) (child->widget, callback_data); - } -} - -GtkWidget * -gtk_toolbar_append_item(GtkToolbar *toolbar, - const char *text, - const char *tooltip_text, - GtkPixmap *icon, - GtkSignalFunc callback, - gpointer user_data) -{ - return gtk_toolbar_insert_item(toolbar, text, tooltip_text, icon, - callback, user_data, toolbar->num_children); + if (child->type != CHILD_SPACE) + (*callback) (child->widget, callback_data); + } } GtkWidget * -gtk_toolbar_prepend_item(GtkToolbar *toolbar, +gtk_toolbar_append_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, GtkPixmap *icon, GtkSignalFunc callback, gpointer user_data) { - return gtk_toolbar_insert_item(toolbar, text, tooltip_text, icon, - callback, user_data, 0); + return gtk_toolbar_insert_item (toolbar, text, tooltip_text, icon, + callback, user_data, toolbar->num_children); } GtkWidget * -gtk_toolbar_insert_item(GtkToolbar *toolbar, - const char *text, - const char *tooltip_text, - GtkPixmap *icon, - GtkSignalFunc callback, - gpointer user_data, - gint position) +gtk_toolbar_prepend_item (GtkToolbar *toolbar, + const char *text, + const char *tooltip_text, + GtkPixmap *icon, + GtkSignalFunc callback, + gpointer user_data) { - Child *child; - GtkWidget *vbox; + return gtk_toolbar_insert_item (toolbar, text, tooltip_text, icon, + callback, user_data, 0); +} - g_return_val_if_fail(toolbar != NULL, NULL); - g_return_val_if_fail(GTK_IS_TOOLBAR(toolbar), NULL); +GtkWidget * +gtk_toolbar_insert_item (GtkToolbar *toolbar, + const char *text, + const char *tooltip_text, + GtkPixmap *icon, + GtkSignalFunc callback, + gpointer user_data, + gint position) +{ + Child *child; + GtkWidget *vbox; - child = g_new(Child, 1); + g_return_val_if_fail (toolbar != NULL, NULL); + g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL); - child->type = CHILD_BUTTON; - child->widget = gtk_button_new(); + child = g_new (Child, 1); - if (callback) - gtk_signal_connect(GTK_OBJECT(child->widget), "clicked", - callback, user_data); + child->type = CHILD_BUTTON; + child->widget = gtk_button_new (); - if (tooltip_text) - gtk_tooltips_set_tips(toolbar->tooltips, child->widget, tooltip_text); + if (callback) + gtk_signal_connect (GTK_OBJECT (child->widget), "clicked", + callback, user_data); - if (text) - child->label = gtk_label_new(text); - else - child->label = NULL; + if (tooltip_text) + gtk_tooltips_set_tips (toolbar->tooltips, child->widget, tooltip_text); - if (icon) - child->icon = GTK_WIDGET(icon); - else - child->icon = NULL; + if (text) + child->label = gtk_label_new (text); + else + child->label = NULL; - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(child->widget), vbox); - gtk_widget_show(vbox); + if (icon) + child->icon = GTK_WIDGET (icon); + else + child->icon = NULL; - if (child->icon) - gtk_box_pack_start(GTK_BOX(vbox), child->icon, FALSE, FALSE, 0); + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (child->widget), vbox); + gtk_widget_show (vbox); - if (child->label) - gtk_box_pack_start(GTK_BOX(vbox), child->label, FALSE, FALSE, 0); + if (child->icon) + gtk_box_pack_start (GTK_BOX (vbox), child->icon, FALSE, FALSE, 0); - switch (toolbar->style) { - case GTK_TOOLBAR_ICONS: - if (child->icon) - gtk_widget_show(child->icon); - break; + if (child->label) + gtk_box_pack_start (GTK_BOX (vbox), child->label, FALSE, FALSE, 0); - case GTK_TOOLBAR_TEXT: - if (child->label) - gtk_widget_show(child->label); - break; + switch (toolbar->style) + { + case GTK_TOOLBAR_ICONS: + if (child->icon) + gtk_widget_show (child->icon); + break; - case GTK_TOOLBAR_BOTH: - if (child->icon) - gtk_widget_show(child->icon); + case GTK_TOOLBAR_TEXT: + if (child->label) + gtk_widget_show (child->label); + break; - if (child->label) - gtk_widget_show(child->label); + case GTK_TOOLBAR_BOTH: + if (child->icon) + gtk_widget_show (child->icon); - break; + if (child->label) + gtk_widget_show (child->label); - default: - g_assert_not_reached(); - } + break; - gtk_widget_show(child->widget); + default: + g_assert_not_reached (); + } - toolbar->children = g_list_insert(toolbar->children, child, position); - toolbar->num_children++; + gtk_widget_show (child->widget); - gtk_widget_set_parent(child->widget, GTK_WIDGET(toolbar)); + toolbar->children = g_list_insert (toolbar->children, child, position); + toolbar->num_children++; - if (GTK_WIDGET_VISIBLE(toolbar)) { - if (GTK_WIDGET_REALIZED(toolbar) - && !GTK_WIDGET_REALIZED(child->widget)) - gtk_widget_realize(child->widget); + gtk_widget_set_parent (child->widget, GTK_WIDGET (toolbar)); - if (GTK_WIDGET_MAPPED(toolbar) - && !GTK_WIDGET_MAPPED(child->widget)) - gtk_widget_map(child->widget); - } + if (GTK_WIDGET_VISIBLE (toolbar)) + { + if (GTK_WIDGET_REALIZED (toolbar) + && !GTK_WIDGET_REALIZED (child->widget)) + gtk_widget_realize (child->widget); + + if (GTK_WIDGET_MAPPED (toolbar) + && !GTK_WIDGET_MAPPED (child->widget)) + gtk_widget_map (child->widget); + } - if (GTK_WIDGET_VISIBLE(child->widget) && GTK_WIDGET_VISIBLE(toolbar)) - gtk_widget_queue_resize(child->widget); + if (GTK_WIDGET_VISIBLE (child->widget) && GTK_WIDGET_VISIBLE (toolbar)) + gtk_widget_queue_resize (child->widget); - return child->widget; + return child->widget; } void -gtk_toolbar_append_space(GtkToolbar *toolbar) +gtk_toolbar_append_space (GtkToolbar *toolbar) { - gtk_toolbar_insert_space(toolbar, toolbar->num_children); + gtk_toolbar_insert_space (toolbar, toolbar->num_children); } void -gtk_toolbar_prepend_space(GtkToolbar *toolbar) +gtk_toolbar_prepend_space (GtkToolbar *toolbar) { - gtk_toolbar_insert_space(toolbar, 0); + gtk_toolbar_insert_space (toolbar, 0); } void -gtk_toolbar_insert_space(GtkToolbar *toolbar, - gint position) +gtk_toolbar_insert_space (GtkToolbar *toolbar, + gint position) { - Child *child; - - g_return_if_fail(toolbar != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(toolbar)); + Child *child; - child = g_new(Child, 1); - child->type = CHILD_SPACE; - child->widget = NULL; - child->icon = NULL; - child->label = NULL; + g_return_if_fail (toolbar != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (toolbar)); - toolbar->children = g_list_insert(toolbar->children, child, position); - toolbar->num_children++; + child = g_new (Child, 1); + child->type = CHILD_SPACE; + child->widget = NULL; + child->icon = NULL; + child->label = NULL; - if (GTK_WIDGET_VISIBLE(toolbar)) - gtk_widget_queue_resize(GTK_WIDGET(toolbar)); + toolbar->children = g_list_insert (toolbar->children, child, position); + toolbar->num_children++; + + if (GTK_WIDGET_VISIBLE (toolbar)) + gtk_widget_queue_resize (GTK_WIDGET (toolbar)); } void -gtk_toolbar_append_widget(GtkToolbar *toolbar, - const char *tooltip_text, - GtkWidget *widget) +gtk_toolbar_append_widget (GtkToolbar *toolbar, + const char *tooltip_text, + GtkWidget *widget) { - gtk_toolbar_insert_widget(toolbar, tooltip_text, widget, toolbar->num_children); + gtk_toolbar_insert_widget (toolbar, tooltip_text, widget, toolbar->num_children); } void -gtk_toolbar_prepend_widget(GtkToolbar *toolbar, - const char *tooltip_text, - GtkWidget *widget) +gtk_toolbar_prepend_widget (GtkToolbar *toolbar, + const char *tooltip_text, + GtkWidget *widget) { - gtk_toolbar_insert_widget(toolbar, tooltip_text, widget, 0); + gtk_toolbar_insert_widget (toolbar, tooltip_text, widget, 0); } void -gtk_toolbar_insert_widget(GtkToolbar *toolbar, - const char *tooltip_text, - GtkWidget *widget, - gint position) +gtk_toolbar_insert_widget (GtkToolbar *toolbar, + const char *tooltip_text, + GtkWidget *widget, + gint position) { - Child *child; + Child *child; - g_return_if_fail(toolbar != NULL); - g_return_if_fail(widget != NULL); + g_return_if_fail (toolbar != NULL); + g_return_if_fail (widget != NULL); - child = g_new(Child, 1); - child->type = CHILD_WIDGET; - child->widget = widget; - child->icon = NULL; - child->label = NULL; + child = g_new (Child, 1); + child->type = CHILD_WIDGET; + child->widget = widget; + child->icon = NULL; + child->label = NULL; - if (tooltip_text) - gtk_tooltips_set_tips(toolbar->tooltips, child->widget, tooltip_text); + if (tooltip_text) + gtk_tooltips_set_tips (toolbar->tooltips, child->widget, tooltip_text); - toolbar->children = g_list_insert(toolbar->children, child, position); - toolbar->num_children++; + toolbar->children = g_list_insert (toolbar->children, child, position); + toolbar->num_children++; - gtk_widget_set_parent(child->widget, GTK_WIDGET(toolbar)); + gtk_widget_set_parent (child->widget, GTK_WIDGET (toolbar)); - if (GTK_WIDGET_VISIBLE(toolbar)) { - if (GTK_WIDGET_REALIZED(toolbar) - && !GTK_WIDGET_REALIZED(child->widget)) - gtk_widget_realize(child->widget); + if (GTK_WIDGET_VISIBLE (toolbar)) + { + if (GTK_WIDGET_REALIZED (toolbar) + && !GTK_WIDGET_REALIZED (child->widget)) + gtk_widget_realize (child->widget); - if (GTK_WIDGET_MAPPED(toolbar) - && !GTK_WIDGET_MAPPED(child->widget)) - gtk_widget_map(child->widget); - } + if (GTK_WIDGET_MAPPED (toolbar) + && !GTK_WIDGET_MAPPED (child->widget)) + gtk_widget_map (child->widget); + } - if (GTK_WIDGET_VISIBLE(child->widget) && GTK_WIDGET_VISIBLE(toolbar)) - gtk_widget_queue_resize(child->widget); + if (GTK_WIDGET_VISIBLE (child->widget) && GTK_WIDGET_VISIBLE (toolbar)) + gtk_widget_queue_resize (child->widget); } void -gtk_toolbar_set_orientation(GtkToolbar *toolbar, - GtkOrientation orientation) +gtk_toolbar_set_orientation (GtkToolbar *toolbar, + GtkOrientation orientation) { - gtk_signal_emit(GTK_OBJECT(toolbar), toolbar_signals[ORIENTATION_CHANGED], orientation); + gtk_signal_emit (GTK_OBJECT (toolbar), toolbar_signals[ORIENTATION_CHANGED], orientation); } void -gtk_toolbar_set_style(GtkToolbar *toolbar, - GtkToolbarStyle style) +gtk_toolbar_set_style (GtkToolbar *toolbar, + GtkToolbarStyle style) { - gtk_signal_emit(GTK_OBJECT(toolbar), toolbar_signals[STYLE_CHANGED], style); + gtk_signal_emit (GTK_OBJECT (toolbar), toolbar_signals[STYLE_CHANGED], style); } void -gtk_toolbar_set_space_size(GtkToolbar *toolbar, - gint space_size) +gtk_toolbar_set_space_size (GtkToolbar *toolbar, + gint space_size) { - g_return_if_fail(toolbar != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(toolbar)); - - if (toolbar->space_size != space_size) { - toolbar->space_size = space_size; - gtk_widget_queue_resize(GTK_WIDGET(toolbar)); - } + g_return_if_fail (toolbar != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (toolbar)); + + if (toolbar->space_size != space_size) + { + toolbar->space_size = space_size; + gtk_widget_queue_resize (GTK_WIDGET (toolbar)); + } } void -gtk_toolbar_set_tooltips(GtkToolbar *toolbar, - gint enable) +gtk_toolbar_set_tooltips (GtkToolbar *toolbar, + gint enable) { - g_return_if_fail(toolbar != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(toolbar)); + g_return_if_fail (toolbar != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (toolbar)); - if (enable) - gtk_tooltips_enable(toolbar->tooltips); - else - gtk_tooltips_disable(toolbar->tooltips); + if (enable) + gtk_tooltips_enable (toolbar->tooltips); + else + gtk_tooltips_disable (toolbar->tooltips); } static void -gtk_toolbar_marshal_signal_1(GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args) +gtk_toolbar_marshal_signal_1 (GtkObject *object, + GtkSignalFunc func, + gpointer func_data, + GtkArg *args) { - GtkToolbarSignal1 rfunc; + GtkToolbarSignal1 rfunc; - rfunc = (GtkToolbarSignal1) func; + rfunc = (GtkToolbarSignal1) func; - (*rfunc) (object, GTK_VALUE_ENUM(args[0]), func_data); + (*rfunc) (object, GTK_VALUE_ENUM (args[0]), func_data); } static void -gtk_real_toolbar_orientation_changed(GtkToolbar *toolbar, - GtkOrientation orientation) +gtk_real_toolbar_orientation_changed (GtkToolbar *toolbar, + GtkOrientation orientation) { - g_return_if_fail(toolbar != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(toolbar)); - - if (toolbar->orientation != orientation) { - toolbar->orientation = orientation; - gtk_widget_queue_resize(GTK_WIDGET(toolbar)); - } + g_return_if_fail (toolbar != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (toolbar)); + + if (toolbar->orientation != orientation) + { + toolbar->orientation = orientation; + gtk_widget_queue_resize (GTK_WIDGET (toolbar)); + } } static void -gtk_real_toolbar_style_changed(GtkToolbar *toolbar, - GtkToolbarStyle style) +gtk_real_toolbar_style_changed (GtkToolbar *toolbar, + GtkToolbarStyle style) { - GList *children; - Child *child; + GList *children; + Child *child; - g_return_if_fail(toolbar != NULL); - g_return_if_fail(GTK_IS_TOOLBAR(toolbar)); + g_return_if_fail (toolbar != NULL); + g_return_if_fail (GTK_IS_TOOLBAR (toolbar)); - if (toolbar->style != style) { - toolbar->style = style; + if (toolbar->style != style) + { + toolbar->style = style; - for (children = toolbar->children; children; children = children->next) { - child = children->data; + for (children = toolbar->children; children; children = children->next) + { + child = children->data; - if (child->type == CHILD_BUTTON) - switch (style) { - case GTK_TOOLBAR_ICONS: - if (child->icon && !GTK_WIDGET_VISIBLE(child->icon)) - gtk_widget_show(child->icon); + if (child->type == CHILD_BUTTON) + switch (style) + { + case GTK_TOOLBAR_ICONS: + if (child->icon && !GTK_WIDGET_VISIBLE (child->icon)) + gtk_widget_show (child->icon); - if (child->label && GTK_WIDGET_VISIBLE(child->label)) - gtk_widget_hide(child->label); + if (child->label && GTK_WIDGET_VISIBLE (child->label)) + gtk_widget_hide (child->label); - break; + break; - case GTK_TOOLBAR_TEXT: - if (child->icon && GTK_WIDGET_VISIBLE(child->icon)) - gtk_widget_hide(child->icon); + case GTK_TOOLBAR_TEXT: + if (child->icon && GTK_WIDGET_VISIBLE (child->icon)) + gtk_widget_hide (child->icon); - if (child->label && !GTK_WIDGET_VISIBLE(child->label)) - gtk_widget_show(child->label); + if (child->label && !GTK_WIDGET_VISIBLE (child->label)) + gtk_widget_show (child->label); - break; + break; - case GTK_TOOLBAR_BOTH: - if (child->icon && !GTK_WIDGET_VISIBLE(child->icon)) - gtk_widget_show(child->icon); + case GTK_TOOLBAR_BOTH: + if (child->icon && !GTK_WIDGET_VISIBLE (child->icon)) + gtk_widget_show (child->icon); - if (child->label && !GTK_WIDGET_VISIBLE(child->label)) - gtk_widget_show(child->label); + if (child->label && !GTK_WIDGET_VISIBLE (child->label)) + gtk_widget_show (child->label); - break; + break; - default: - g_assert_not_reached(); - } - } - - gtk_widget_queue_resize(GTK_WIDGET(toolbar)); + default: + g_assert_not_reached (); + } } + + gtk_widget_queue_resize (GTK_WIDGET (toolbar)); + } } |