wayland: Remove non-existing gdkscreen-wayland.h from SOURCES

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

diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h
index ab8b4cf89b3e1af9414a6f41d7dded664302a93a..3a526b5cb14fb48bfda387b2ef0d6baf37c727d8 100644 (file)
--- a/gtk/gtkhpaned.h
+++ b/gtk/gtkhpaned.h
@@ -2,48 +2,49 @@
  * 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-1999.  See the AUTHORS
+ * 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/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_HPANED_H__
 #define __GTK_HPANED_H__
 
-
-#include <gdk/gdk.h>
 #include <gtk/gtkpaned.h>
 
+G_BEGIN_DECLS
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+#define GTK_TYPE_HPANED                   (gtk_hpaned_get_type ())
+#define GTK_HPANED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned))
+#define GTK_HPANED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HPANED, GtkHPanedClass))
+#define GTK_IS_HPANED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HPANED))
+#define GTK_IS_HPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HPANED))
+#define GTK_HPANED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HPANED, GtkHPanedClass))
 
-#define GTK_HPANED(obj)          GTK_CHECK_CAST (obj, gtk_hpaned_get_type (), GtkHPaned)
-#define GTK_HPANED_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_hpaned_get_type (), GtkHPanedClass)
-#define GTK_IS_HPANED(obj)       GTK_CHECK_TYPE (obj, gtk_hpaned_get_type ())
 
-
-typedef struct _GtkHPaned       GtkHPaned;
-typedef struct _GtkHPanedClass  GtkHPanedClass;
+typedef struct _GtkHPaned      GtkHPaned;
+typedef struct _GtkHPanedClass GtkHPanedClass;
 
 struct _GtkHPaned
 {
@@ -56,13 +57,9 @@ struct _GtkHPanedClass
 };
 
 
-guint      gtk_hpaned_get_type (void);
-GtkWidget* gtk_hpaned_new      (void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType       gtk_hpaned_get_type (void) G_GNUC_CONST;
+GtkWidget * gtk_hpaned_new      (void);
 
+G_END_DECLS
 
 #endif /* __GTK_HPANED_H__ */