Rename GdkQuartzWindow.h and .c to GdkQuartzNSWindow.h and .c

[~andy/gtk] / gtk / gtkhbox.h

diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h
index 0c346105799dbc09f118f97e2cfd6383559af3d1..e04c7314cf8e375a6fca4611ff16073f5d6beb2f 100644 (file)
--- a/gtk/gtkhbox.h
+++ b/gtk/gtkhbox.h
@@ -2,38 +2,47 @@
  * 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
+ * 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.
  */
+
+/*
+ * 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/.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_HBOX_H__
 #define __GTK_HBOX_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-
-#define GTK_TYPE_HBOX           (gtk_hbox_get_type ())
-#define GTK_HBOX(obj)           (GTK_CHECK_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
-#define GTK_HBOX_CLASS(klass)   (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
-#define GTK_IS_HBOX(obj)        (GTK_CHECK_TYPE ((obj), GTK_TYPE_HBOX))
-#define GTK_IS_HBOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBOX))
+#define GTK_TYPE_HBOX            (gtk_hbox_get_type ())
+#define GTK_HBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
+#define GTK_HBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
+#define GTK_IS_HBOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HBOX))
+#define GTK_IS_HBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBOX))
+#define GTK_HBOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HBOX, GtkHBoxClass))
 
 
 typedef struct _GtkHBox              GtkHBox;
@@ -50,14 +59,10 @@ struct _GtkHBoxClass
 };
 
 
-GtkType           gtk_hbox_get_type (void);
-GtkWidget* gtk_hbox_new             (gboolean homogeneous,
-                             gint spacing);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType       gtk_hbox_get_type (void) G_GNUC_CONST;
+GtkWidget * gtk_hbox_new      (gboolean homogeneous,
+                               gint     spacing);
 
+G_END_DECLS
 
 #endif /* __GTK_HBOX_H__ */