Fix for #119555, Peter Zelesny:

Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>

	Fix for #119555, Peter Zelesny:

	* gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image.
	* gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public
	by removing the _ prefix.
	* gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c,
	gdk/gdkwindow.c: Adjust all callers.

diff --git a/ChangeLog b/ChangeLog
index e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a..d9222cdad7c4ff96c48a91ae3c8de2685ba83b04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #119555, Peter Zelesny:
+       
+       * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image.
+       * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public
+       by removing the _ prefix. 
+       * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, 
+       gdk/gdkwindow.c: Adjust all callers.
+
 Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c (gtk_action_activate): Only activate if 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a..d9222cdad7c4ff96c48a91ae3c8de2685ba83b04 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #119555, Peter Zelesny:
+       
+       * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image.
+       * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public
+       by removing the _ prefix. 
+       * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, 
+       gdk/gdkwindow.c: Adjust all callers.
+
 Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c (gtk_action_activate): Only activate if 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a..d9222cdad7c4ff96c48a91ae3c8de2685ba83b04 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #119555, Peter Zelesny:
+       
+       * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image.
+       * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public
+       by removing the _ prefix. 
+       * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, 
+       gdk/gdkwindow.c: Adjust all callers.
+
 Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c (gtk_action_activate): Only activate if 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a..d9222cdad7c4ff96c48a91ae3c8de2685ba83b04 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #119555, Peter Zelesny:
+       
+       * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image.
+       * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public
+       by removing the _ prefix. 
+       * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, 
+       gdk/gdkwindow.c: Adjust all callers.
+
 Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c (gtk_action_activate): Only activate if 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1d5f74e3f2862e11c03fe9e16ef96b9e1f48c6a..d9222cdad7c4ff96c48a91ae3c8de2685ba83b04 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #119555, Peter Zelesny:
+       
+       * gdk/gdkdrawable.h: Declare gdk_drawable_copy_to_image.
+       * gdk/gdkdraw.c (gdk_drawable_copy_to_image): Make public
+       by removing the _ prefix. 
+       * gdk/gdkdraw.c, gdk/gdkpixbuf-drawable.c, gdk/gdkpixmap.c, 
+       gdk/gdkwindow.c: Adjust all callers.
+
 Mon Nov 17 23:36:02 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c (gtk_action_activate): Only activate if 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 4c830558824ddb18a018119956d262b1576735b4..1c5a81b91290c34ca4837dc845328fc86a6da13c 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 18 00:12:23 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/gdk-sections.txt: Add gdk_drawable_copy_to_image.
+
 Mon Nov 17 23:29:21 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtk-sections.txt: Add gtk_combo_box_new_with_model,

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index a673b1e6cb4ac919f5e78461bf87bbe289fac111..8185010263736dcc74c9db18b94e5e6bd089c04b 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -466,6 +466,7 @@ gdk_draw_pixmap
 gdk_draw_drawable
 gdk_draw_image
 gdk_drawable_get_image
+gdk_drawable_copy_to_image
 
 <SUBSECTION Standard>
 GDK_DRAWABLE

diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index ae8bb124f1a71cc5aea3a0d2a956bda838604fb9..1abb3e9b3ed6da34a1e51401df47a8f52e30e4a9 100644 (file)
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -897,7 +897,7 @@ gdk_draw_glyphs (GdkDrawable      *drawable,
 
 
 /**
- * _gdk_drawable_copy_to_image:
+ * gdk_drawable_copy_to_image:
  * @drawable: a #GdkDrawable
  * @image: a #GdkDrawable, or %NULL if a new @image should be created.
  * @src_x: x coordinate on @drawable
@@ -912,17 +912,19 @@ gdk_draw_glyphs (GdkDrawable      *drawable,
  * and copies into that. See gdk_drawable_get_image() for further details.
  * 
  * Return value: @image, or a new a #GdkImage containing the contents
-                 of @drawable
+ *               of @drawable
+ * 
+ * Since: 2.4
  **/
 GdkImage*
-_gdk_drawable_copy_to_image (GdkDrawable *drawable,
-                            GdkImage    *image,
-                            gint         src_x,
-                            gint         src_y,
-                            gint         dest_x,
-                            gint         dest_y,
-                            gint         width,
-                            gint         height)
+gdk_drawable_copy_to_image (GdkDrawable *drawable,
+                           GdkImage    *image,
+                           gint         src_x,
+                           gint         src_y,
+                           gint         dest_x,
+                           gint         dest_y,
+                           gint         width,
+                           gint         height)
 {
   GdkDrawable *composite;
   gint composite_x_offset = 0;
@@ -1065,7 +1067,7 @@ gdk_drawable_real_get_image (GdkDrawable     *drawable,
                             gint             width,
                             gint             height)
 {
-  return _gdk_drawable_copy_to_image (drawable, NULL, x, y, 0, 0, width, height);
+  return gdk_drawable_copy_to_image (drawable, NULL, x, y, 0, 0, width, height);
 }
 
 static GdkDrawable*
@@ -1457,10 +1459,10 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable  *drawable,
                                                            width1, height1,
                                                            gdk_drawable_get_depth (drawable), &xs0, &ys0);
                  
-                 _gdk_drawable_copy_to_image (drawable, image,
-                                              dest_x + x0, dest_y + y0,
-                                              xs0, ys0,
-                                              width1, height1);
+                 gdk_drawable_copy_to_image (drawable, image,
+                                             dest_x + x0, dest_y + y0,
+                                             xs0, ys0,
+                                             width1, height1);
                  (*composite_func) (pixbuf->pixels + (src_y + y0) * pixbuf->rowstride + (src_x + x0) * 4,
                                     pixbuf->rowstride,
                                     (guchar*)image->mem + ys0 * image->bpl + xs0 * image->bpp,

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index f250f3ea097eb0b59349e39081b97569c715b0d5..170a6f89ec05b73bec23287a83a3bfb4f0131a6e 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -343,11 +343,19 @@ void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
 #define gdk_draw_bitmap                gdk_draw_drawable
 #endif /* GDK_DISABLE_DEPRECATED */
 
-GdkImage* gdk_drawable_get_image (GdkDrawable *drawable,
-                                  gint         x,
-                                  gint         y,
-                                  gint         width,
-                                  gint         height);
+GdkImage* gdk_drawable_get_image      (GdkDrawable *drawable,
+                                       gint         x,
+                                       gint         y,
+                                       gint         width,
+                                       gint         height);
+GdkImage *gdk_drawable_copy_to_image (GdkDrawable  *drawable,
+                                     GdkImage     *image,
+                                     gint          src_x,
+                                     gint          src_y,
+                                     gint          dest_x,
+                                     gint          dest_y,
+                                     gint          width,
+                                     gint          height);
 
 GdkRegion *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
 GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable);

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 531b635515128116046429dea2f2e673ab9a1d48..7ec5c6d5cf5be8a39621b0f32ca44c72b71f25d9 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -1298,8 +1298,8 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf   *dest,
          image = _gdk_image_get_scratch (gdk_drawable_get_screen (src), 
                                          width1, height1, depth, &xs0, &ys0);
 
-         _gdk_drawable_copy_to_image (src, image,
-                                      src_x + x0, src_y + y0,
+         gdk_drawable_copy_to_image (src, image,
+                                     src_x + x0, src_y + y0,
                                       xs0, ys0, width1, height1);
 
          gdk_pixbuf_get_from_image (dest, image, cmap,

diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index f0134c21ecd2d87e00443a718a16879979f044af..b7e126b80224f6fab16cd8b4dcebee70c7cf2310 100644 (file)
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -470,10 +470,10 @@ gdk_pixmap_copy_to_image (GdkDrawable     *drawable,
 {
   g_return_val_if_fail (GDK_IS_PIXMAP (drawable), NULL);
   
-  return _gdk_drawable_copy_to_image (((GdkPixmapObject*)drawable)->impl,
-                                     image,
-                                     src_x, src_y, dest_x, dest_y,
-                                     width, height);
+  return gdk_drawable_copy_to_image (((GdkPixmapObject*)drawable)->impl,
+                                    image,
+                                    src_x, src_y, dest_x, dest_y,
+                                    width, height);
 }
 
 static GdkBitmap *

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 5ad7cd1df8c46f110584ad514805463124df0def..e06881e5cf199fb874d359210db2145a8b10dfec 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1941,12 +1941,12 @@ gdk_window_copy_to_image (GdkDrawable     *drawable,
   
   _gdk_windowing_window_get_offsets (drawable, &x_offset, &y_offset);
   
-  return _gdk_drawable_copy_to_image (((GdkWindowObject*)drawable)->impl,
-                                     image,
-                                     src_x - x_offset,
-                                     src_y - y_offset,
-                                     dest_x, dest_y,
-                                     width, height);
+  return gdk_drawable_copy_to_image (((GdkWindowObject*)drawable)->impl,
+                                    image,
+                                    src_x - x_offset,
+                                    src_y - y_offset,
+                                    dest_x, dest_y,
+                                    width, height);
 }
 
 /* Code for dirty-region queueing