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, 10 insertions, 16 deletions

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 7452c52e8..d2af4bf08 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -2900,14 +2900,13 @@ draw_arrow (GdkWindow     *window,
 	    gint           width,
 	    gint           height)
 {
-  cairo_t *cr = gdk_drawable_create_cairo_context (window);
+  cairo_t *cr = gdk_cairo_create (window);
   gdk_cairo_set_source_color (cr, color);
   
   if (area)
     {
-      cairo_rectangle (cr, area->x, area->y, area->width, area->height);
+      gdk_cairo_rectangle (cr, area);
       cairo_clip (cr);
-      cairo_new_path (cr);
     }
     
   if (arrow_type == GTK_ARROW_DOWN)
@@ -3611,7 +3610,7 @@ gtk_default_draw_check (GtkStyle      *style,
 			gint           width,
 			gint           height)
 {
-  cairo_t *cr = gdk_drawable_create_cairo_context (window);
+  cairo_t *cr = gdk_cairo_create (window);
   enum { BUTTON, MENU, CELL } type = BUTTON;
   int exterior_size;
   int interior_size;
@@ -3627,9 +3626,8 @@ gtk_default_draw_check (GtkStyle      *style,
       
   if (area)
     {
-      cairo_rectangle (cr, area->x, area->y, area->width, area->height);
+      gdk_cairo_rectangle (cr, area);
       cairo_clip (cr);
-      cairo_new_path (cr);
     }
   
   exterior_size = MIN (width, height);
@@ -3737,7 +3735,7 @@ gtk_default_draw_option (GtkStyle      *style,
 			 gint           width,
 			 gint           height)
 {
-  cairo_t *cr = gdk_drawable_create_cairo_context (window);
+  cairo_t *cr = gdk_cairo_create (window);
   enum { BUTTON, MENU, CELL } type = BUTTON;
   int exterior_size;
   
@@ -3751,9 +3749,8 @@ gtk_default_draw_option (GtkStyle      *style,
       
   if (area)
     {
-      cairo_rectangle (cr, area->x, area->y, area->width, area->height);
+      gdk_cairo_rectangle (cr, area);
       cairo_clip (cr);
-      cairo_new_path (cr);
     }
   
   exterior_size = MIN (width, height);
@@ -4543,7 +4540,7 @@ gtk_default_draw_focus (GtkStyle      *style,
 
   sanitize_size (window, &width, &height);
 
-  cr = gdk_drawable_create_cairo_context (window);
+  cr = gdk_cairo_create (window);
   
   if (detail && !strcmp (detail, "colorwheel_light"))
     cairo_set_source_rgb (cr, 0., 0., 0.);
@@ -4583,10 +4580,8 @@ gtk_default_draw_focus (GtkStyle      *style,
 
   if (area)
     {
-      cairo_rectangle (cr,
-		       area->x, area->y, area->width, area->height);
+      gdk_cairo_rectangle (cr, area);
       cairo_clip (cr);
-      cairo_new_path (cr);
     }
 
   cairo_rectangle (cr,
@@ -4793,13 +4788,12 @@ gtk_default_draw_expander (GtkStyle        *style,
   double x_double, y_double;
   gint degrees = 0;
 
-  cairo_t *cr = gdk_drawable_create_cairo_context (window);
+  cairo_t *cr = gdk_cairo_create (window);
   
   if (area)
     {
-      cairo_rectangle (cr, area->x, area->y, area->width, area->height);
+      gdk_cairo_rectangle (cr, area);
       cairo_clip (cr);
-      cairo_new_path (cr);
     }
 
   if (widget &&