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.

diff --git a/ChangeLog b/ChangeLog
index 9b2dcaeeff5b8318bf9b9a0be0ed6c3710a44338..71087aaeb133c1c7ea4699e415eaf8dca3a2913b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * gtk/gtkwidget.c (gtk_widget_queue_clear_area): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9b2dcaeeff5b8318bf9b9a0be0ed6c3710a44338..71087aaeb133c1c7ea4699e415eaf8dca3a2913b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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>
 
        * gtk/gtkwidget.c (gtk_widget_queue_clear_area): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9b2dcaeeff5b8318bf9b9a0be0ed6c3710a44338..71087aaeb133c1c7ea4699e415eaf8dca3a2913b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * gtk/gtkwidget.c (gtk_widget_queue_clear_area): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9b2dcaeeff5b8318bf9b9a0be0ed6c3710a44338..71087aaeb133c1c7ea4699e415eaf8dca3a2913b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
 
        * gtk/gtkwidget.c (gtk_widget_queue_clear_area): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9b2dcaeeff5b8318bf9b9a0be0ed6c3710a44338..71087aaeb133c1c7ea4699e415eaf8dca3a2913b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        * gtk/gtkwidget.c (gtk_widget_queue_clear_area): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9b2dcaeeff5b8318bf9b9a0be0ed6c3710a44338..71087aaeb133c1c7ea4699e415eaf8dca3a2913b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * gtk/gtkwidget.c (gtk_widget_queue_clear_area): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9b2dcaeeff5b8318bf9b9a0be0ed6c3710a44338..71087aaeb133c1c7ea4699e415eaf8dca3a2913b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * gtk/gtkwidget.c (gtk_widget_queue_clear_area): 

diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 22103f0708a29729c21affe5b8a95c59ec9e6484..faef74d220a6e01ae77455db7a17f38f74d89207 100644 (file)
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -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 */

diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 72ad78aee51614cd995977e83538d06c389b4fc3..7b86a1bdf899a1b7d64cca09a6c6e2b6fb8a4d07 100644 (file)
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -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);
     }
 }