Merges from gtk-1-2

2000-03-14 19:57:25 +00:00
parent 3f98a849c7
commit 10ba4fd066
98 changed files with 3772 additions and 1749 deletions
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@ -101,7 +101,7 @@ gdk_colors_store (GdkColormap   *colormap,
 static GMemChunk *color_chunk;

 GdkColor*
-gdk_color_copy (GdkColor *color)
+gdk_color_copy (const GdkColor *color)
 {
  GdkColor *new_color;
  
@ -221,7 +221,7 @@ gdk_color_hash (const GdkColor *colora)
 	  (colora->blue >> 6));
 }

-gint
+gboolean
 gdk_color_equal (const GdkColor *colora,
 		 const GdkColor *colorb)
 {