Skip to content

GitLab

Commit 03d9f983 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik
Browse files

grouped function names into application-level, widget-level and 

Fri Feb 19 17:52:28 1999  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.h: grouped function names into application-level,
        widget-level and non-public.

        * gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
        pix_requisition instead of item->pixmaps_box->requisition.
parent b60c8a83
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 38 deletions
ChangeLog
View file @ 03d9f983
Fri Feb 19 17:52:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.h: grouped function names into application-level,
widget-level and non-public.
* gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
pix_requisition instead of item->pixmaps_box->requisition.
Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area):
......
ChangeLog.pre-2-0
View file @ 03d9f983
Fri Feb 19 17:52:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.h: grouped function names into application-level,
widget-level and non-public.
* gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
pix_requisition instead of item->pixmaps_box->requisition.
Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area):
......
ChangeLog.pre-2-10
View file @ 03d9f983
Fri Feb 19 17:52:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.h: grouped function names into application-level,
widget-level and non-public.
* gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
pix_requisition instead of item->pixmaps_box->requisition.
Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area):
......
ChangeLog.pre-2-2
View file @ 03d9f983
Fri Feb 19 17:52:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.h: grouped function names into application-level,
widget-level and non-public.
* gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
pix_requisition instead of item->pixmaps_box->requisition.
Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area):
......
ChangeLog.pre-2-4
View file @ 03d9f983
Fri Feb 19 17:52:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.h: grouped function names into application-level,
widget-level and non-public.
* gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
pix_requisition instead of item->pixmaps_box->requisition.
Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area):
......
ChangeLog.pre-2-6
View file @ 03d9f983
Fri Feb 19 17:52:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.h: grouped function names into application-level,
widget-level and non-public.
* gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
pix_requisition instead of item->pixmaps_box->requisition.
Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area):
......
ChangeLog.pre-2-8
View file @ 03d9f983
Fri Feb 19 17:52:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.h: grouped function names into application-level,
widget-level and non-public.
* gtk/gtktreeitem.c (gtk_tree_item_size_request): use auto
pix_requisition instead of item->pixmaps_box->requisition.
Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area):
......
gtk/gtksignal.h
View file @ 03d9f983
......@@ -46,7 +46,6 @@ typedef gboolean (*GtkEmissionHook) (GtkObject *object,
GtkArg *params,
gpointer data);
typedef struct _GtkSignalQuery GtkSignalQuery;
struct _GtkSignalQuery
......@@ -61,38 +60,11 @@ struct _GtkSignalQuery
const GtkType *params;
};
void gtk_signal_init (void);
guint gtk_signal_new (const gchar *name,
GtkSignalRunType signal_flags,
GtkType object_type,
guint function_offset,
GtkSignalMarshaller marshaller,
GtkType return_val,
guint nparams,
...);
guint gtk_signal_newv (const gchar *name,
GtkSignalRunType signal_flags,
GtkType object_type,
guint function_offset,
GtkSignalMarshaller marshaller,
GtkType return_val,
guint nparams,
GtkType *params);
/* Application-level methods */
guint gtk_signal_lookup (const gchar *name,
GtkType object_type);
gchar* gtk_signal_name (guint signal_id);
void gtk_signal_emit (GtkObject *object,
guint signal_id,
...);
void gtk_signal_emit_by_name (GtkObject *object,
const gchar *name,
...);
void gtk_signal_emitv (GtkObject *object,
guint signal_id,
GtkArg *params);
void gtk_signal_emitv_by_name (GtkObject *object,
const gchar *name,
GtkArg *params);
guint gtk_signal_n_emissions (GtkObject *object,
guint signal_id);
guint gtk_signal_n_emissions_by_name (GtkObject *object,
......@@ -165,7 +137,6 @@ guint gtk_signal_handler_pending_by_func (GtkObject *object,
gboolean may_be_blocked,
GtkSignalFunc func,
gpointer data);
void gtk_signal_handlers_destroy (GtkObject *object);
guint gtk_signal_add_emission_hook (guint signal_id,
GtkEmissionHook hook_func,
gpointer data);
......@@ -176,9 +147,6 @@ guint gtk_signal_add_emission_hook_full (guint signal_id,
void gtk_signal_remove_emission_hook (guint signal_id,
guint hook_id);
void gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
GtkSignalDestroy destroy_func);
/* Report internal information about a signal. The caller has the
* responsibility to invoke a subsequent g_free (returned_data); but
* must not modify data pointed to by the members of GtkSignalQuery
......@@ -186,6 +154,43 @@ void gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
GtkSignalQuery* gtk_signal_query (guint signal_id);
/* Widget-level methods */
void gtk_signal_init (void);
guint gtk_signal_new (const gchar *name,
GtkSignalRunType signal_flags,
GtkType object_type,
guint function_offset,
GtkSignalMarshaller marshaller,
GtkType return_val,
guint nparams,
...);
guint gtk_signal_newv (const gchar *name,
GtkSignalRunType signal_flags,
GtkType object_type,
guint function_offset,
GtkSignalMarshaller marshaller,
GtkType return_val,
guint nparams,
GtkType *params);
void gtk_signal_emit (GtkObject *object,
guint signal_id,
...);
void gtk_signal_emit_by_name (GtkObject *object,
const gchar *name,
...);
void gtk_signal_emitv (GtkObject *object,
guint signal_id,
GtkArg *params);
void gtk_signal_emitv_by_name (GtkObject *object,
const gchar *name,
GtkArg *params);
/* Non-public methods */
void gtk_signal_handlers_destroy (GtkObject *object);
void gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
GtkSignalDestroy destroy_func);
#ifdef __cplusplus
}
#endif /* __cplusplus */
......
gtk/gtktreeitem.c
View file @ 03d9f983
......@@ -500,17 +500,19 @@ gtk_tree_item_size_request (GtkWidget *widget,
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
GtkRequisition pix_requisition;
gtk_widget_size_request (bin->child, &child_requisition);
requisition->width += child_requisition.width;
gtk_widget_size_request (item->pixmaps_box,
&item->pixmaps_box->requisition);
requisition->width += item->pixmaps_box->requisition.width + DEFAULT_DELTA +
GTK_TREE(widget->parent)->current_indent;
&pix_requisition);
requisition->width += pix_requisition.width + DEFAULT_DELTA +
GTK_TREE (widget->parent)->current_indent;
requisition->height += MAX (child_requisition.height,
item->pixmaps_box->requisition.height);
pix_requisition.height);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment