adapt to handle PangoColor

2001-01-26  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor

	* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
	not offset by TREE_VIEW_HEADER_HEIGHT
	(gtk_tree_view_tree_to_widget_coords): fix to not offset by
	TREE_VIEW_HEADER_HEIGHT

	* configure.in (included_loaders): for me, --with-included-loaders
	generates the error "the specified loader yes does not exist",
	i.e. the arg defaults to "yes", so change test for value ""
	to test for value "yes", and include all loaders in that case.

	* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function

	* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
	handle TREE_VIEW_VERTICAL_SEPARATOR
	(gtk_tree_view_bin_expose): fix to consider the row offset as
	pointing halfway into vertical separator.
	(gtk_tree_view_draw_node_focus_rect): ditto

	* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
	--gtk-debug=updates, which causes gdk_window_set_debug_updates
	(TRUE) to be called.

	* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
	debug mode where the invalid region is colored in on invalidate,
	so you can see the flicker and know whether your redraw code is
	doing a good job.

	* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
	tree window coordinates (clip rect is in tree window coords)

	* gtk/Makefile.am: add gtktreednd.[hc]

	* gtk/gtkliststore.c: implement gtktreednd interfaces.

	* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
	drag-and-drop data operations on a model (so we can set up tree
	drag-and-drop automatically)

	* gtk/testgtk.c: Add a window to change sensitivity in the
	GtkLabel test; add a way to change the entry frame in GtkEntry
	test

	* gtk/gtkentry.c (gtk_entry_set_has_frame):
	(gtk_entry_get_has_frame): new functions to remove the frame
	around an entry
	(gtk_entry_size_request): shrink requisition if no frame
	(gtk_entry_draw_focus): don't draw frame if no frame

	* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
	checks inside a cell renderer
	(gtk_default_draw_option): ditto for options

	* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
	children from the alignment, not the button
	(gtk_tree_view_column_init): ref/sink the column, to emulate
	GObject refcounting.

	* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink

	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
	Use theme functions to draw the toggles

	* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors

	* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
	GdkPangoAttrEmbossed to use in rendering insensitive text

	* gdk/gdkpango.c (gdk_draw_layout_line): render new properties

	* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
	using new GDK features

1 files changed, 24 insertions, 46 deletions

diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index d6dfa7547..4ff6c7e52 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -226,7 +226,9 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
   GtkCellRendererToggle *celltoggle = (GtkCellRendererToggle *) cell;
   gint width, height;
   gint real_xoffset, real_yoffset;
-
+  GtkShadowType shadow;
+  GtkStateType state;
+  
   width = MIN (TOGGLE_WIDTH, cell_area->width - cell->xpad * 2);
   height = MIN (TOGGLE_WIDTH, cell_area->height - cell->ypad * 2);
 
@@ -238,57 +240,33 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
   real_yoffset = cell->yalign * (cell_area->height - height - (2 * cell->ypad));
   real_yoffset = MAX (real_yoffset, 0) + cell->ypad;
 
-  gdk_gc_set_clip_rectangle (widget->style->black_gc, cell_area);
+  shadow = celltoggle->active ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
 
-  if (!celltoggle->radio)
+  if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+    state = GTK_STATE_SELECTED;
+  else
+    state = GTK_STATE_NORMAL;
+  
+  if (celltoggle->radio)
     {
-      gdk_draw_rectangle (window,
-			  widget->style->black_gc,
-			  FALSE,
-			  cell_area->x + real_xoffset,
-			  cell_area->y + real_yoffset,
-			  width, height);
-      if (celltoggle->active)
-	{
-	  gdk_draw_line (window,
-			 widget->style->black_gc,
-			 cell_area->x + real_xoffset,
-			 cell_area->y + real_yoffset,
-			 cell_area->x + real_xoffset + width,
-			 cell_area->y + real_yoffset + height);
-	  gdk_draw_line (window,
-			 widget->style->black_gc,
-			 cell_area->x + real_xoffset + width,
-			 cell_area->y + real_yoffset,
-			 cell_area->x + real_xoffset,
-			 cell_area->y + real_yoffset + height);
-	}
+      gtk_paint_option (widget->style,
+                        window,
+                        state, shadow,
+                        cell_area, widget, "cellradio",
+                        cell_area->x + real_xoffset,
+                        cell_area->y + real_yoffset,
+                        width, height);
     }
   else
     {
-      gdk_draw_arc (window,
-		    widget->style->black_gc,
-		    FALSE,
-		    cell_area->x + real_xoffset,
-		    cell_area->y + real_yoffset,
-		    width,
-		    height,
-		    0, 360*64);
-      if (celltoggle->active)
-	{
-	  gdk_draw_arc (window,
-			widget->style->black_gc,
-			TRUE,
-			cell_area->x + real_xoffset + 2,
-			cell_area->y + real_yoffset + 2,
-			width - 4,
-			height - 4,
-			0, 360*64);
-	}
+      gtk_paint_check (widget->style,
+                       window,
+                       state, shadow,
+                       cell_area, widget, "cellcheck",
+                       cell_area->x + real_xoffset,
+                       cell_area->y + real_yoffset,
+                       width, height);
     }
-
-
-  gdk_gc_set_clip_rectangle (widget->style->black_gc, NULL);
 }
 
 static gint