X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbin.h;h=1ec0fa3cfa5726e8d99f4eb5b9f4fd905ee7b54b;hb=ce0675f1fb2582717793ec29b1787039dfbf8437;hp=02a8c44d5595171c3f1eb709267bc873000973d4;hpb=92006c8e78e9c41656cb7a95ec290882faffaaae;p=~andy%2Fgtk
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 02a8c44d5..1ec0fa3cf 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -2,60 +2,78 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see .
*/
+
+/*
+ * 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_BIN_H__
#define __GTK_BIN_H__
-#include
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
-#define GTK_BIN(obj) GTK_CHECK_CAST (obj, gtk_bin_get_type (), GtkBin)
-#define GTK_BIN_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_bin_get_type (), GtkBinClass)
-#define GTK_IS_BIN(obj) GTK_CHECK_TYPE (obj, gtk_bin_get_type ())
+#define GTK_TYPE_BIN (gtk_bin_get_type ())
+#define GTK_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BIN, GtkBin))
+#define GTK_BIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BIN, GtkBinClass))
+#define GTK_IS_BIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BIN))
+#define GTK_IS_BIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BIN))
+#define GTK_BIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BIN, GtkBinClass))
-typedef struct _GtkBin GtkBin;
-typedef struct _GtkBinClass GtkBinClass;
+typedef struct _GtkBin GtkBin;
+typedef struct _GtkBinPrivate GtkBinPrivate;
+typedef struct _GtkBinClass GtkBinClass;
struct _GtkBin
{
GtkContainer container;
- GtkWidget *child;
+ /*< private >*/
+ GtkBinPrivate *priv;
};
struct _GtkBinClass
{
GtkContainerClass parent_class;
+
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
};
-guint gtk_bin_get_type (void);
+GType gtk_bin_get_type (void) G_GNUC_CONST;
+GtkWidget *gtk_bin_get_child (GtkBin *bin);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void _gtk_bin_set_child (GtkBin *bin,
+ GtkWidget *widget);
+G_END_DECLS
#endif /* __GTK_BIN_H__ */