X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstatusbar.h;h=af018b69608cd9b2712b9df38048cf25403d9903;hb=5e2c23214564f7dcc687fa8467020eeb6b9407a9;hp=84026ca44915ae7b4f6676a2fef8ad6dd9a91ce9;hpb=cb7c950af0f8aae25c20a98678cecfa4035b7a19;p=~andy%2Fgtk

diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index 84026ca44..af018b696 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -13,27 +13,26 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_STATUSBAR_H__
 #define __GTK_STATUSBAR_H__
 
-#include <gtk/gtkhbox.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gtk/gtkbox.h>
 
+G_BEGIN_DECLS
 
 #define GTK_TYPE_STATUSBAR            (gtk_statusbar_get_type ())
 #define GTK_STATUSBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
@@ -43,32 +42,23 @@ extern "C" {
 #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 _GtkStatusbar              GtkStatusbar;
+typedef struct _GtkStatusbarPrivate       GtkStatusbarPrivate;
+typedef struct _GtkStatusbarClass         GtkStatusbarClass;
 
 struct _GtkStatusbar
 {
-  GtkHBox parent_widget;
+  GtkBox parent_widget;
 
-  GtkWidget *frame;
-  GtkWidget *label;
-
-  GSList *messages;
-  GSList *keys;
-
-  guint seq_context_id;
-  guint seq_message_id;
-
-  GdkWindow *grip_window;
-  
-  guint has_resize_grip : 1;
+  /*< private >*/
+  GtkStatusbarPrivate *priv;
 };
 
 struct _GtkStatusbarClass
 {
-  GtkHBoxClass parent_class;
+  GtkBoxClass parent_class;
 
-  GMemChunk *messages_mem_chunk;
+  gpointer reserved;
 
   void	(*text_pushed)	(GtkStatusbar	*statusbar,
 			 guint		 context_id,
@@ -101,12 +91,11 @@ void       gtk_statusbar_pop          	(GtkStatusbar *statusbar,
 void       gtk_statusbar_remove        	(GtkStatusbar *statusbar,
 					 guint	       context_id,
 					 guint         message_id);
+void       gtk_statusbar_remove_all    	(GtkStatusbar *statusbar,
+					 guint	       context_id);
+
+GtkWidget* gtk_statusbar_get_message_area  (GtkStatusbar *statusbar);
 
-void     gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
-					    gboolean      setting);
-gboolean gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar);
+G_END_DECLS
 
-#ifdef __cplusplus
-} 
-#endif /* __cplusplus */
 #endif /* __GTK_STATUSBAR_H__ */