gdk/gdkdraw.c #include gdkcairo.h for gdk_cairo_create() declaration.

Sat May 14 00:07:46 2005  Manish Singh  <yosh@gimp.org>

        * gdk/gdkdraw.c
        * gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
        declaration.

        * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
        call gdk_cairo_set_source_color() with a color.

        * gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.

        * tests/testiconview.c (main): cast args of drag functions to the
        appropriate type.

8 files changed, 51 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index f377a7a21f..fc2c209148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sat May 14 00:07:46 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/gdkdraw.c
+	* gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
+	declaration.
+
+	* gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
+	call gdk_cairo_set_source_color() with a color.
+
+	* gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.
+
+	* tests/testiconview.c (main): cast args of drag functions to the
+	appropriate type.
+
 2005-05-13  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f377a7a21f..fc2c209148 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Sat May 14 00:07:46 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/gdkdraw.c
+	* gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
+	declaration.
+
+	* gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
+	call gdk_cairo_set_source_color() with a color.
+
+	* gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.
+
+	* tests/testiconview.c (main): cast args of drag functions to the
+	appropriate type.
+
 2005-05-13  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f377a7a21f..fc2c209148 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Sat May 14 00:07:46 2005  Manish Singh  <yosh@gimp.org>
+
+	* gdk/gdkdraw.c
+	* gdk/gdkpango.c: #include gdkcairo.h for gdk_cairo_create()
+	declaration.
+
+	* gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): actually
+	call gdk_cairo_set_source_color() with a color.
+
+	* gtk/gtkimage.c (gtk_image_expose): remove unused stock_id variable.
+
+	* tests/testiconview.c (main): cast args of drag functions to the
+	appropriate type.
+
 2005-05-13  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkdrawable-x11.c: Update for cairo-xlib API change.
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 93e3e9f8f3..fd76de77ad 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <math.h>
 #include <pango/pangocairo.h>
+#include "gdkcairo.h"
 #include "gdkdrawable.h"
 #include "gdkinternals.h"
 #include "gdkwindow.h"
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index a160511dc7..8ade753e1b 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <math.h>
 #include <pango/pangocairo.h>
+#include "gdkcairo.h"
 #include "gdkcolor.h"
 #include "gdkgc.h"
 #include "gdkinternals.h"
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 8494103682..d2758313f8 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -6463,7 +6463,8 @@ gtk_icon_view_create_drag_icon (GtkIconView *icon_view,
 	  cr = gdk_cairo_create (drawable);
 	  cairo_set_line_width (cr, 1.);
 
-	  gdk_cairo_set_source_color (cr, &widget->style->base_gc);
+	  gdk_cairo_set_source_color
+	    (cr, &widget->style->base[GTK_WIDGET_STATE (widget)]);
 	  cairo_rectangle (cr, 0, 0, item->width + 2, item->height + 2);
 	  cairo_fill (cr);
 
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index c88ebbfcc1..3a0ecc9ef8 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1547,9 +1547,7 @@ gtk_image_expose (GtkWidget      *widget,
       GdkBitmap *mask;
       GdkPixbuf *pixbuf;
       gboolean needs_state_transform;
-      gchar *stock_id;
-	  
-      
+
       image = GTK_IMAGE (widget);
       misc = GTK_MISC (widget);
 
diff --git a/tests/testiconview.c b/tests/testiconview.c
index e5e5b244ee..1ef1464cfe 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -502,22 +502,22 @@ main (gint argc, gchar **argv)
 #endif
   /* Allow DND between the icon view and the tree view */
   
-  gtk_icon_view_enable_model_drag_source (icon_list,
+  gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (icon_list),
 					  GDK_BUTTON1_MASK,
 					  item_targets,
 					  G_N_ELEMENTS (item_targets),
 					  GDK_ACTION_MOVE);
-  gtk_icon_view_enable_model_drag_dest (icon_list,
+  gtk_icon_view_enable_model_drag_dest (GTK_ICON_VIEW (icon_list),
 					item_targets,
 					G_N_ELEMENTS (item_targets),
 					GDK_ACTION_MOVE);
 
-  gtk_tree_view_enable_model_drag_source (tv,
+  gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tv),
 					  GDK_BUTTON1_MASK,
 					  item_targets,
 					  G_N_ELEMENTS (item_targets),
 					  GDK_ACTION_MOVE);
-  gtk_tree_view_enable_model_drag_dest (tv,
+  gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (tv),
 					item_targets,
 					G_N_ELEMENTS (item_targets),
 					GDK_ACTION_MOVE);