callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Tim Janik
1999-02-19 18:07:29 +00:00
committed by Tim Janik
parent b60c8a83d7
commit 03d9f983de
9 changed files with 101 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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> Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): * gtk/gtkwidget.c (gtk_widget_queue_clear_area):

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
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> Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): * gtk/gtkwidget.c (gtk_widget_queue_clear_area):

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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> Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): * gtk/gtkwidget.c (gtk_widget_queue_clear_area):

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
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> Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): * gtk/gtkwidget.c (gtk_widget_queue_clear_area):

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
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> Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): * gtk/gtkwidget.c (gtk_widget_queue_clear_area):

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
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> Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): * gtk/gtkwidget.c (gtk_widget_queue_clear_area):

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
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> Thu Feb 18 17:26:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): * gtk/gtkwidget.c (gtk_widget_queue_clear_area):

73
gtk/gtksignal.h
View File

@ -46,7 +46,6 @@ typedef gboolean (*GtkEmissionHook) (GtkObject *object,
GtkArg *params, GtkArg *params,
gpointer data); gpointer data);
typedef struct _GtkSignalQuery GtkSignalQuery; typedef struct _GtkSignalQuery GtkSignalQuery;
struct _GtkSignalQuery struct _GtkSignalQuery
@ -61,38 +60,11 @@ struct _GtkSignalQuery
const GtkType *params; const GtkType *params;
}; };
void gtk_signal_init (void);
guint gtk_signal_new (const gchar *name, /* Application-level methods */
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);
guint gtk_signal_lookup (const gchar *name, guint gtk_signal_lookup (const gchar *name,
GtkType object_type); GtkType object_type);
gchar* gtk_signal_name (guint signal_id); 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 gtk_signal_n_emissions (GtkObject *object,
guint signal_id); guint signal_id);
guint gtk_signal_n_emissions_by_name (GtkObject *object, 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, gboolean may_be_blocked,
GtkSignalFunc func, GtkSignalFunc func,
gpointer data); gpointer data);
void gtk_signal_handlers_destroy (GtkObject *object);
guint gtk_signal_add_emission_hook (guint signal_id, guint gtk_signal_add_emission_hook (guint signal_id,
GtkEmissionHook hook_func, GtkEmissionHook hook_func,
gpointer data); 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, void gtk_signal_remove_emission_hook (guint signal_id,
guint hook_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 /* Report internal information about a signal. The caller has the
* responsibility to invoke a subsequent g_free (returned_data); but * responsibility to invoke a subsequent g_free (returned_data); but
* must not modify data pointed to by the members of GtkSignalQuery * 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); 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 #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

8
gtk/gtktreeitem.c
View File

@ -500,17 +500,19 @@ gtk_tree_item_size_request (GtkWidget *widget,
if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{ {
GtkRequisition pix_requisition;
gtk_widget_size_request (bin->child, &child_requisition); gtk_widget_size_request (bin->child, &child_requisition);
requisition->width += child_requisition.width; requisition->width += child_requisition.width;
gtk_widget_size_request (item->pixmaps_box, gtk_widget_size_request (item->pixmaps_box,
&item->pixmaps_box->requisition); &pix_requisition);
requisition->width += item->pixmaps_box->requisition.width + DEFAULT_DELTA + requisition->width += pix_requisition.width + DEFAULT_DELTA +
GTK_TREE (widget->parent)->current_indent; GTK_TREE (widget->parent)->current_indent;
requisition->height += MAX (child_requisition.height, requisition->height += MAX (child_requisition.height,
item->pixmaps_box->requisition.height); pix_requisition.height);
} }
} }