X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstatusbar.h;h=af018b69608cd9b2712b9df38048cf25403d9903;hb=cf216d780cb2c889a3bcb5faa825fc1b21af8896;hp=dc9a2f2488c0b5ecef0adf655662b22a6ba7bb8a;hpb=839be1dfdb41666332e21c389791070b160f217c;p=~andy%2Fgtk

diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index dc9a2f248..af018b696 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -3,70 +3,99 @@
  * GtkStatusbar Copyright (C) 1998 Shawn T. Amundson
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_STATUSBAR_H__
-#define __GTK_STATUSBAR_H_
+#define __GTK_STATUSBAR_H__
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtkbox.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-#define GTK_STATUSBAR(obj)          GTK_CHECK_CAST (obj, gtk_statusbar_get_type (), GtkStatusbar)
-#define GTK_STATUSBAR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_statusbar_get_type (), GtkStatusbarClass)
-#define GTK_IS_STATUSBAR(obj)       GTK_CHECK_TYPE (obj, gtk_statusbar_get_type ())
+#define GTK_TYPE_STATUSBAR            (gtk_statusbar_get_type ())
+#define GTK_STATUSBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
+#define GTK_STATUSBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
+#define GTK_IS_STATUSBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR))
+#define GTK_IS_STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STATUSBAR))
+#define GTK_STATUSBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
 
-typedef struct _GtkStatusbar      GtkStatusbar;
-typedef struct _GtkStatusbarClass GtkStatusbarClass;
-typedef struct _GtkStatusbarMsg GtkStatusbarMsg;
+
+typedef struct _GtkStatusbar              GtkStatusbar;
+typedef struct _GtkStatusbarPrivate       GtkStatusbarPrivate;
+typedef struct _GtkStatusbarClass         GtkStatusbarClass;
 
 struct _GtkStatusbar
 {
-  GtkHBox parent_widget;
-
-  GtkWidget *frame;
-  GtkWidget *label;
-  GList *msgs;
+  GtkBox parent_widget;
 
-  gint next_statusid;
+  /*< private >*/
+  GtkStatusbarPrivate *priv;
 };
 
 struct _GtkStatusbarClass
 {
-  GtkHBoxClass parent_class;
-};
+  GtkBoxClass parent_class;
 
-struct _GtkStatusbarMsg
-{
-  gchar *str;
-  gint statusid;
+  gpointer reserved;
+
+  void	(*text_pushed)	(GtkStatusbar	*statusbar,
+			 guint		 context_id,
+			 const gchar	*text);
+  void	(*text_popped)	(GtkStatusbar	*statusbar,
+			 guint		 context_id,
+			 const gchar	*text);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-guint      gtk_statusbar_get_type     	(void);
+
+GType      gtk_statusbar_get_type     	(void) G_GNUC_CONST;
 GtkWidget* gtk_statusbar_new          	(void);
+/* If you don't want to use contexts, 0 is a predefined global
+ * context_id you can pass to push/pop/remove
+ */
+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,
+					 guint	       context_id);
+void       gtk_statusbar_remove        	(GtkStatusbar *statusbar,
+					 guint	       context_id,
+					 guint         message_id);
+void       gtk_statusbar_remove_all    	(GtkStatusbar *statusbar,
+					 guint	       context_id);
 
-/* Returns StatusID used for gtk_statusbar_push */
-gint       gtk_statusbar_push          	(GtkStatusbar *statusbar, 
-					 gchar *text);
+GtkWidget* gtk_statusbar_get_message_area  (GtkStatusbar *statusbar);
 
-void       gtk_statusbar_pop          	(GtkStatusbar *statusbar, 
-					 gint statusid);
+G_END_DECLS
 
-#ifdef __cplusplus
-} 
-#endif /* __cplusplus */
-#endif /* __GTK_STATUSBAR_H_ */
+#endif /* __GTK_STATUSBAR_H__ */