Revert name change

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

diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h
index 4d1d220824230044af9ec7dc65e7e45ff1a855f3..545765d047e1e73db3769a8b3cf6bcde1de415a2 100644 (file)
--- a/gtk/gtklistitem.h
+++ b/gtk/gtklistitem.h
@@ -2,39 +2,37 @@
  * 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/. 
  */
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_LIST_ITEM_H__
 #define __GTK_LIST_ITEM_H__
 
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
+#include <gtk/gtk.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_LIST_ITEM              (gtk_list_item_get_type ())
@@ -42,6 +40,7 @@ extern "C" {
 #define GTK_LIST_ITEM_CLASS(klass)      (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST_ITEM, GtkListItemClass))
 #define GTK_IS_LIST_ITEM(obj)           (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST_ITEM))
 #define GTK_IS_LIST_ITEM_CLASS(klass)   (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_ITEM))
+#define GTK_LIST_ITEM_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST_ITEM, GtkListItemClass))
 
 
 typedef struct _GtkListItem       GtkListItem;
@@ -76,7 +75,7 @@ struct _GtkListItemClass
 };
 
 
-GtkType    gtk_list_item_get_type       (void);
+GtkType    gtk_list_item_get_type       (void) G_GNUC_CONST;
 GtkWidget* gtk_list_item_new            (void);
 GtkWidget* gtk_list_item_new_with_label (const gchar      *label);
 void       gtk_list_item_select         (GtkListItem      *list_item);
@@ -84,10 +83,9 @@ void       gtk_list_item_deselect       (GtkListItem      *list_item);
 
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_LIST_ITEM_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */