Fix comment. (gdk_window_set_title): Surround by release pool macros.

[~andy/gtk] / gdk / gdkimage.h

diff --git a/gdk/gdkimage.h b/gdk/gdkimage.h
index 81e4679dd617c70458d8f06f53544f4c64f75410..5b8303be6b382b3d7391702f1cb832f25b7146a2 100644 (file)
--- a/gdk/gdkimage.h
+++ b/gdk/gdkimage.h
@@ -1,11 +1,35 @@
+/* GDK - The GIMP Drawing Kit
+ * 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 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
+ * Lesser General Public License for more details.
+ *
+ * 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/. 
+ */
+
 #ifndef __GDK_IMAGE_H__
 #define __GDK_IMAGE_H__
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Types of images.
  *   Normal: Normal X image type. These are slow as they involve passing
@@ -37,21 +61,24 @@ typedef struct _GdkImageClass GdkImageClass;
 struct _GdkImage
 {
   GObject parent_instance;
+
+  /*< public >*/
   
-  GdkImageType type;
-  GdkVisual    *visual;            /* visual used to create the image */
-  GdkByteOrder byte_order;
-  gint         width;
-  gint         height;
-  guint16      depth;
-  guint16      bpp;            /* bytes per pixel */
-  guint16      bpl;            /* bytes per line */
-  guint16       bits_per_pixel; /* bits per pixel */
+  GdkImageType type; /* read only. */
+  GdkVisual    *visual;            /* read only. visual used to create the image */
+  GdkByteOrder byte_order; /* read only. */
+  gint         width; /* read only. */
+  gint         height; /* read only. */
+  guint16      depth; /* read only. */
+  guint16      bpp;            /* read only. bytes per pixel */
+  guint16      bpl;            /* read only. bytes per line */
+  guint16       bits_per_pixel; /* read only. bits per pixel */
   gpointer     mem;
 
-  GdkColormap  *colormap;
-  
-  gpointer windowing_data;
+  GdkColormap  *colormap; /* read only. */
+
+  /*< private >*/
+  gpointer windowing_data; /* read only. */
 };
 
 struct _GdkImageClass
@@ -66,6 +93,7 @@ GdkImage*  gdk_image_new       (GdkImageType  type,
                                gint          width,
                                gint          height);
 
+#ifndef GDK_DISABLE_DEPRECATED
 GdkImage*  gdk_image_get       (GdkDrawable  *drawable,
                                gint          x,
                                gint          y,
@@ -74,6 +102,7 @@ GdkImage*  gdk_image_get       (GdkDrawable  *drawable,
 
 GdkImage * gdk_image_ref       (GdkImage     *image);
 void       gdk_image_unref     (GdkImage     *image);
+#endif
 
 void      gdk_image_put_pixel (GdkImage     *image,
                                gint          x,
@@ -99,8 +128,6 @@ GdkImage* gdk_image_new_bitmap (GdkVisual     *visual,
 #define gdk_image_destroy              gdk_image_unref
 #endif /* GDK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_IMAGE_H__ */