complete api change to honour message contexts. unfortunaltely this also

Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkstatusbar.h:
        * gtk/gtkstatusbar.c: complete api change to honour message contexts.
        unfortunaltely this also involved argument changes on the signal
        emissions which will not be caught by the compiler. your callbacks
        should look like:
        void  message_text_popped (GtkStatusbar   *statusbar,
                                   guint           context_id,
                                   const gchar    *text,
                                   gpointer        func_data);

        * gtk/gtkwidget.c (gtk_widget_set_rc_style): eliminated bug about
        initial signal emission.
        (gtk_widget_set_parent): don't ensure style, just call
        gtk_widget_set_style_recurse.
        (gtk_widget_set_style_recurse): only change a widget's rc styles if
        if there has already been a lookup.

        * gtk/testgtk.c: adaptions for statusbar widget.
        substituted notebook pixmaps with pixmaps from fvwm, since
        we don't know where the originals came from.

        * gtk/gtkobject.c (gtk_object_data_destroy): call the destroy
        notifier with the objects data, not its internal structure.

        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): small
        fix from lars.

1 files changed, 18 insertions, 9 deletions

diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index 498c04abbe..c173fa4551 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -41,9 +41,11 @@ struct _GtkStatusbar
   GtkWidget *frame;
   GtkWidget *label;
 
-  GList *messages;
+  GSList *messages;
+  GSList *keys;
 
-  guint seq_status_id;
+  guint seq_context_id;
+  guint seq_message_id;
 };
 
 struct _GtkStatusbarClass
@@ -53,26 +55,33 @@ struct _GtkStatusbarClass
   GMemChunk *messages_mem_chunk;
 
   void	(*text_pushed)	(GtkStatusbar	*statusbar,
+			 guint		 context_id,
 			 const gchar	*text);
   void	(*text_popped)	(GtkStatusbar	*statusbar,
+			 guint		 context_id,
 			 const gchar	*text);
 };
 
 struct _GtkStatusbarMsg
 {
   gchar *text;
-  guint status_id;
+  guint context_id;
+  guint message_id;
 };
 
 guint      gtk_statusbar_get_type     	(void);
 GtkWidget* gtk_statusbar_new          	(void);
-
-/* Returns StatusID used for gtk_statusbar_push */
-guint      gtk_statusbar_push          	(GtkStatusbar *statusbar, 
+guint	   gtk_statusbar_get_context_id	(GtkStatusbar *statusbar,
+					 const gchar  *context_description);
+/* Returns message_id used for gtk_statusbar_remove */
+guint      gtk_statusbar_push          	(GtkStatusbar *statusbar,
+					 guint	       context_id,
 					 const gchar  *text);
-void       gtk_statusbar_pop          	(GtkStatusbar *statusbar);
-void       gtk_statusbar_steal         	(GtkStatusbar *statusbar, 
-					 guint          status_id);
+void       gtk_statusbar_pop          	(GtkStatusbar *statusbar,
+					 guint	       context_id);
+void       gtk_statusbar_remove        	(GtkStatusbar *statusbar,
+					 guint	       context_id,
+					 guint         message_id);