Don't leak the old page size when

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

diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h
index e00a4f64112b93247eba209dd623b27fb3cc036c..1bb4f8543416e2e72085da6f85a87e79e93dc105 100644 (file)
--- a/gtk/gtkpixmap.h
+++ b/gtk/gtkpixmap.h
@@ -2,28 +2,30 @@
  * 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_PIXMAP_H__
 #define __GTK_PIXMAP_H__
 
@@ -32,16 +34,14 @@
 #include <gtk/gtkmisc.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PIXMAP                         (gtk_pixmap_get_type ())
 #define GTK_PIXMAP(obj)                         (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap))
 #define GTK_PIXMAP_CLASS(klass)                 (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP, GtkPixmapClass))
 #define GTK_IS_PIXMAP(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP))
 #define GTK_IS_PIXMAP_CLASS(klass)      (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP))
+#define GTK_PIXMAP_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP, GtkPixmapClass))
 
 
 typedef struct _GtkPixmap      GtkPixmap;
@@ -64,7 +64,7 @@ struct _GtkPixmapClass
 };
 
 
-GtkType           gtk_pixmap_get_type   (void);
+GtkType           gtk_pixmap_get_type   (void) G_GNUC_CONST;
 GtkWidget* gtk_pixmap_new       (GdkPixmap  *pixmap,
                                  GdkBitmap  *mask);
 void      gtk_pixmap_set        (GtkPixmap  *pixmap,
@@ -75,12 +75,11 @@ void           gtk_pixmap_get        (GtkPixmap  *pixmap,
                                  GdkBitmap **mask);
 
 void       gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap,
-                                            guint build);
+                                            gboolean   build);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_PIXMAP_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */