Use a GtkAlignment rather than a GtkDrawingArea to draw the swatch in to

2005-05-11  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcolorbutton.c: Use a GtkAlignment rather than a GtkDrawingArea
	to draw the swatch in to avoid having an extraneous window.

	* gtk/gtkcolorsel.c (color_sample_draw_sample): Actually se tthe
	color when !has_opacity.

2005-05-10  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkcairo.[ch] gdk/gdkcolor.[ch] gdk/Makefile.am: Add source
	files for Cairo convenience functionality.

	* gdk/gdkcairo.h (gdk_cairo_rectangle, gdk_cairo_region): Add a
	convenience functions to add GdkRectangle, GdkRegion to a cairo path.

	* gdk/gdkwindow.c gdk/gdkgc.c gtk/gtkcolorsel.c gtk/gtkiconview.c
	gtk/gtkstyle.c: Use gdk_cairo_rectangle/region().

	* gdk/gdkcairo.[ch] gdk/gdkdrawable.h gdk/gdkdraw.c: Rename
	gdk_drawable_create_cairo_context() to gdk_cairo_create().

	* gdk/gdkcairo.c gdk/gdkpixbuf.h gdk/gdkpixbuf-render.c:
	Rename gdk_pixbuf_set_as_cairo_source() to
	gdk_cairo_set_source_pixbuf().

	* gdk/gdkdraw.c gdk/gdkpango.c gtk/gtkcolorsel.c gtk/gtkhruler.c
	gtk/gtkhsv.c gtk/gtkiconview.c gtk/gtkstyle.c gtk/gtkvruler.c:
	Adjust for renames.

	* gdk/gdk.symbols: Update.

	* gtk/gtkwidget.c (gtk_widget_queue_shallow_draw): Fix
	coordinate system problem that was causing the wrong portions
	to be invalidated.

	* gtk/gtkcellrenderer.c (gtk_cell_renderer_render)
	gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render)
	gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_render)
	gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render)
	gtk/gtkcellview.c (gtk_cell_view_expose)
	gtk/gtkdnd.c (gtk_drag_highlight_expose)
	gtk/gtkentry.c (gtk_entry_draw_text)
	gtk/gtktextview.c (text_window_invalidate_rect): Some cairoization.

	* gtk/gtkcalendar.[ch]: Beat into something roughly resembling
	GTK+ style ... use instance-private data and standard names for
	private structure, etc. Move function docs inline.

	* gtk/gtkcalendar.[ch]: Switch to drawing everything in
	expose. Switch drawing to Cairo.

	* gtk/gtkcalendar.c (gtk_calendar_freeze): Deprecate
	gtk_calendar_freeze/thaw

1 files changed, 15 insertions, 10 deletions

diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c
index a5b0d95ff7..c01bbd2f17 100644
--- a/gtk/gtkcellrendererprogress.c
+++ b/gtk/gtkcellrendererprogress.c
@@ -318,36 +318,41 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
 				   guint            flags)
 {
   GtkCellRendererProgress *cellprogress = GTK_CELL_RENDERER_PROGRESS (cell);
-  GdkGC *gc;
   PangoLayout *layout;
   PangoRectangle logical_rect;
   gint x, y, w, h, perc_w, pos;
   GdkRectangle clip;
   gboolean is_rtl;
+  cairo_t *cr;
 
   is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
   
-  gc = gdk_gc_new (window);
+  cr = gdk_cairo_create (window);
   
   x = cell_area->x + cell->xpad;
   y = cell_area->y + cell->ypad;
   
   w = cell_area->width - cell->xpad * 2;
   h = cell_area->height - cell->ypad * 2;
-  
-  gdk_gc_set_rgb_fg_color (gc, &widget->style->fg[GTK_STATE_NORMAL]);
-  gdk_draw_rectangle (window, gc, TRUE, x, y, w, h);
+
+  cairo_rectangle (cr, x, y, w, h);
+  gdk_cairo_set_source_color (cr, &widget->style->fg[GTK_STATE_NORMAL]);
+  cairo_fill (cr);
   
   x += widget->style->xthickness;
   y += widget->style->ythickness;
   w -= widget->style->xthickness * 2;
   h -= widget->style->ythickness * 2;
-  gdk_gc_set_rgb_fg_color (gc, &widget->style->bg[GTK_STATE_NORMAL]);
-  gdk_draw_rectangle (window, gc, TRUE, x, y, w, h);
   
-  gdk_gc_set_rgb_fg_color (gc, &widget->style->bg[GTK_STATE_SELECTED]);
+  cairo_rectangle (cr, x, y, w, h);
+  gdk_cairo_set_source_color (cr, &widget->style->bg[GTK_STATE_NORMAL]);
+  cairo_fill (cr);
+  
   perc_w = w * MAX (0, cellprogress->priv->value) / 100;
-  gdk_draw_rectangle (window, gc, TRUE, is_rtl ? (x + w - perc_w) : x, y, perc_w, h);
+  
+  cairo_rectangle (cr, is_rtl ? (x + w - perc_w) : x, y, perc_w, h);
+  gdk_cairo_set_source_color (cr, &widget->style->bg[GTK_STATE_SELECTED]);
+  cairo_fill (cr);
   
   layout = gtk_widget_create_pango_layout (widget, cellprogress->priv->label);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
@@ -375,7 +380,7 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
 		    layout);
   
   g_object_unref (layout);
-  g_object_unref (gc);
+  cairo_destroy (cr);
 }
 
 #define __GTK_CELL_RENDERER_PROGRESS_C__