Export _gdk_draw_pixbuf as gdk_draw_pixbuf(), rename the _draw_pixbuf

Wed Oct  2 17:46:53 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/gdkdrawable.h gdk/gdkinternals.h gdk/gdkdraw.c
        gdk/gdkwindow.c gdk/gdkdrawable.c: Export _gdk_draw_pixbuf
        as gdk_draw_pixbuf(), rename the _draw_pixbuf virtual
        function to draw_pixbuf. (#60582)

        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable[_alpha]):
        Note that these functions are obsolete in the docs.

        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable):
        Remove all the sanity checks now we make it clear
        that it is obsolete name for gdk_draw_pixbuf().

        * gdk/gdkpixmap.c gtk/gtkcellrendererpixbuf.c gtk/gtkimage.c
          gtk/gtkpixmap.c demos/testpixbuf-scale.c demos/testpixbuf.c
          tests/testrgb.c: Use gdk_draw_pixbuf() everywhere.

        * gtk/gtklabel.c (gtk_label_set_mnemonic_widget): Fix
        some warnings.

        * gdk/gdkinternals.h (struct _GdkEventPrivate): Fix missed
        bit from last gdk_event_get_screen() change.

        * gdk/gdkevents.c: Couple of small fixes.i

5 files changed, 43 insertions, 44 deletions

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 1252d2eef2..9a9dffa2a7 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -446,17 +446,16 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
   pix_rect.height -= cell->ypad * 2;
 
   if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
-    gdk_pixbuf_render_to_drawable_alpha (pixbuf,
-                                         window,
-                                         /* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
-                                         draw_rect.x - pix_rect.x,
-                                         draw_rect.y - pix_rect.y,
-                                         draw_rect.x,
-                                         draw_rect.y,
-                                         draw_rect.width,
-                                         draw_rect.height,
-                                         GDK_PIXBUF_ALPHA_FULL,
-                                         0,
-                                         GDK_RGB_DITHER_NORMAL,
-                                         0, 0);
+    gdk_draw_pixbuf (window,
+		     widget->style->black_gc,
+		     pixbuf,
+		     /* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
+		     draw_rect.x - pix_rect.x,
+		     draw_rect.y - pix_rect.y,
+		     draw_rect.x,
+		     draw_rect.y,
+		     draw_rect.width,
+		     draw_rect.height,
+		     GDK_RGB_DITHER_NORMAL,
+		     0, 0);
 }
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 3ca712b65a..e94a049a4e 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1424,17 +1424,17 @@ gtk_image_expose (GtkWidget      *widget,
 
               if (pixbuf)
                 {
-                  gdk_pixbuf_render_to_drawable (pixbuf,
-						 widget->window,
-						 widget->style->black_gc,						 
-						 image_bound.x - x,
-						 image_bound.y - y,
-						 image_bound.x,
-						 image_bound.y,
-						 image_bound.width,
-						 image_bound.height,
-						 GDK_RGB_DITHER_NORMAL,
-						 0, 0);
+                  gdk_draw_pixbuf (widget->window,
+				   widget->style->black_gc,
+				   pixbuf,
+				   image_bound.x - x,
+				   image_bound.y - y,
+				   image_bound.x,
+				   image_bound.y,
+				   image_bound.width,
+				   image_bound.height,
+				   GDK_RGB_DITHER_NORMAL,
+				   0, 0);
 
                   g_object_unref (G_OBJECT (pixbuf));
                   pixbuf = NULL;
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 0ca6237c5c..a89d03f6f5 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -756,12 +756,12 @@ gtk_label_set_mnemonic_widget (GtkLabel  *label,
     g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (label->mnemonic_widget)
-    g_object_weak_unref (label->mnemonic_widget,
+    g_object_weak_unref (G_OBJECT (label->mnemonic_widget),
 			 label_mnemonic_widget_weak_notify,
 			 label);
   label->mnemonic_widget = widget;
   if (label->mnemonic_widget)
-    g_object_weak_ref (label->mnemonic_widget,
+    g_object_weak_ref (G_OBJECT (label->mnemonic_widget),
 		       label_mnemonic_widget_weak_notify,
 		       label);
   
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c
index e37ae0bad7..d7f6a86190 100644
--- a/gtk/gtkpixmap.c
+++ b/gtk/gtkpixmap.c
@@ -287,14 +287,14 @@ build_insensitive_pixmap (GtkPixmap *gtkpixmap)
   
   insensitive = gdk_pixmap_new (GTK_WIDGET (gtkpixmap)->window, w, h, -1);
 
-  gdk_pixbuf_render_to_drawable (stated,
-                                 insensitive,
-                                 GTK_WIDGET (gtkpixmap)->style->white_gc,
-                                 0, 0,
-                                 0, 0,
-                                 w, h,
-                                 GDK_RGB_DITHER_NORMAL,
-                                 0, 0);
+  gdk_draw_pixbuf (insensitive,
+		   GTK_WIDGET (gtkpixmap)->style->white_gc,
+		   stated,
+		   0, 0,
+		   0, 0,
+		   w, h,
+		   GDK_RGB_DITHER_NORMAL,
+		   0, 0);
 
   gtkpixmap->pixmap_insensitive = insensitive;
 
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 75b3fc932c..b1c4ceebe6 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -395,16 +395,16 @@ render_layout_line (GdkDrawable        *drawable,
                                               pixbuf_rect.x, pixbuf_rect.y);
                     }
 
-                  gdk_pixbuf_render_to_drawable (pixbuf,
-                                                 drawable,
-                                                 render_state->fg_gc,
-                                                 draw_rect.x - pixbuf_rect.x,
-                                                 draw_rect.y - pixbuf_rect.y,
-                                                 draw_rect.x, draw_rect.y,
-                                                 draw_rect.width,
-                                                 draw_rect.height,
-                                                 GDK_RGB_DITHER_NORMAL,
-                                                 0, 0);
+                  gdk_draw_pixbuf (drawable,
+				   render_state->fg_gc,
+				   pixbuf,
+				   draw_rect.x - pixbuf_rect.x,
+				   draw_rect.y - pixbuf_rect.y,
+				   draw_rect.x, draw_rect.y,
+				   draw_rect.width,
+				   draw_rect.height,
+				   GDK_RGB_DITHER_NORMAL,
+				   0, 0);
 
                   if (mask)
                     {