2.13.6

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

diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index 3298ad8b9519985c78b4a402397c76073f527307..e6cd09a36eedcc311d65d1e64bcc5959a2db625e 100644 (file)
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -1,13 +1,42 @@
+/* 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/.
+ */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_PIXBUF_H__
 #define __GDK_PIXBUF_H__
 
+#include <cairo.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkrgb.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Rendering to a drawable */
 
@@ -20,6 +49,7 @@ void gdk_pixbuf_render_threshold_alpha   (GdkPixbuf           *pixbuf,
                                          int                  width,
                                          int                  height,
                                          int                  alpha_threshold);
+#ifndef GDK_DISABLE_DEPRECATED
 void gdk_pixbuf_render_to_drawable       (GdkPixbuf           *pixbuf,
                                          GdkDrawable         *drawable,
                                          GdkGC               *gc,
@@ -45,16 +75,18 @@ void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf           *pixbuf,
                                          GdkRgbDither         dither,
                                          int                  x_dither,
                                          int                  y_dither);
-
+#endif /* GDK_DISABLE_DEPRECATED */
 void gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf    *pixbuf,
                                                     GdkColormap  *colormap,
                                                     GdkPixmap   **pixmap_return,
                                                     GdkBitmap   **mask_return,
                                                     int           alpha_threshold);
+#ifndef GDK_MULTIHEAD_SAFE
 void gdk_pixbuf_render_pixmap_and_mask              (GdkPixbuf    *pixbuf,
                                                     GdkPixmap   **pixmap_return,
                                                     GdkBitmap   **mask_return,
                                                     int           alpha_threshold);
+#endif
 
 
 /* Fetching a region from a drawable */
@@ -78,8 +110,6 @@ GdkPixbuf *gdk_pixbuf_get_from_image    (GdkPixbuf   *dest,
                                          int          width,
                                          int          height);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_PIXBUF_H__ */