Reimplement _NET_WM_SYNC_REQUEST inside X11 backend

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

diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index c6154ff40df937f5dc8a70e5055678d5571c17ac..96e2d7f7dd220ec4a8150ecb60ef8fa7c1aadcc4 100644 (file)
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -12,9 +12,7 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,64 +22,30 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GDK_PIXBUF_H__
+#define __GDK_PIXBUF_H__
+
 #if !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>
 
 G_BEGIN_DECLS
 
-/* Rendering to a drawable */
-
-void gdk_pixbuf_render_threshold_alpha   (GdkPixbuf           *pixbuf,
-                                         GdkBitmap           *bitmap,
-                                         int                  src_x,
-                                         int                  src_y,
-                                         int                  dest_x,
-                                         int                  dest_y,
-                                         int                  width,
-                                         int                  height,
-                                         int                  alpha_threshold);
-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 */
-GdkPixbuf *gdk_pixbuf_get_from_drawable (GdkPixbuf   *dest,
-                                        GdkDrawable *src,
-                                        GdkColormap *cmap,
-                                        int          src_x,
-                                        int          src_y,
-                                        int          dest_x,
-                                        int          dest_y,
-                                        int          width,
-                                        int          height);
-
-GdkPixbuf *gdk_pixbuf_get_from_image    (GdkPixbuf   *dest,
-                                         GdkImage    *src,
-                                         GdkColormap *cmap,
-                                         int          src_x,
-                                         int          src_y,
-                                         int          dest_x,
-                                         int          dest_y,
-                                         int          width,
-                                         int          height);
+GdkPixbuf *gdk_pixbuf_get_from_window  (GdkWindow       *window,
+                                        gint             src_x,
+                                        gint             src_y,
+                                        gint             width,
+                                        gint             height);
+
+GdkPixbuf *gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
+                                        gint             src_x,
+                                        gint             src_y,
+                                        gint             width,
+                                        gint             height);
 
 G_END_DECLS