Patch for #105497 - const GdkColor *



Hi,

Please see http://bugzilla.gnome.org/show_bug.cgi?id=105497

The attached patch constifies all uses of GdkColor that I could find
that need it.  Is it OK to apply?  I don't think I constified anything
that I shouldn't have, but people may have better eyeballs.

  Federico

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.4779
diff -u -r1.4779 ChangeLog
--- ChangeLog	6 Jan 2004 20:39:46 -0000	1.4779
+++ ChangeLog	7 Jan 2004 00:42:53 -0000
@@ -1,5 +1,63 @@
 2004-01-06  Federico Mena Quintero  <federico ximian com>
 
+	Fix #105497; constify uses of GdkColor.
+
+	* gdk/gdkgc.c (gdk_gc_set_rgb_fg_color): Constify.
+	(gdk_gc_set_rgb_bg_color): Constify.
+	(gdk_gc_set_foreground): Constify.
+
+	* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): Constify.
+	* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): Constify.
+	* gdk/linux-fb/gdkcursor-fb.c (gdk_cursor_new_from_pixmap): Constify.
+
+	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_create_from_data): Constify.
+	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_create_from_data): Constify.
+	* gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_create_from_data): Constify.
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_background): Constify.
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_background): Constify.
+	* gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_background): Constify.
+
+	* gdk/gdkpango.c (gdk_draw_layout_line_with_colors): Constify.
+	(gdk_draw_layout_with_colors): Constify.
+
+	* gdk/gdkpixmap.c (gdk_pixmap_colormap_new_from_pixbuf): Constify.
+	(gdk_pixmap_colormap_create_from_xpm): Constify.
+	(gdk_pixmap_create_from_xpm): Constify.
+	(gdk_pixmap_colormap_create_from_xpm_d): Constify.
+	(gdk_pixmap_create_from_xpm_d): Constify.
+
+	* gtk/gtkcellview.c (gtk_cell_view_set_background_color): Constify.
+
+	* gtk/gtkclist.c (gtk_clist_set_foreground): Constify.
+	(gtk_clist_set_background): Constify.
+
+	* gtk/gtkcolorbutton.c (gtk_color_button_new_with_color): Constify.
+	(gtk_color_button_set_color): Constify.
+
+	* gtk/gtkcolorsel.c (gtk_color_selection_set_current_color):
+	Constify and add a check for color != NULL.
+	(gtk_color_selection_get_current_color): Add a check for color != NULL.
+	(gtk_color_selection_set_previous_color): Constify and add a check
+	for color != NULL.
+	(gtk_color_selection_get_previous_color): Add a check for color != NULL.
+
+	* gtk/gtkctree.c (gtk_ctree_node_set_foreground): Constify.
+	(gtk_ctree_node_set_background): Constify.
+
+	* gtk/gtktext.c (gtk_text_insert): Constify.
+	(insert_text_property): Constify.
+	(text_properties_equal): Constify.
+	(new_text_property): Constify.
+
+	* gtk/gtkwidget.c (gtk_widget_modify_color_component): Constify.
+	(gtk_widget_modify_fg): Constify.
+	(gtk_widget_modify_bg): Constify.
+	(gtk_widget_modify_text): Constify.
+	(gtk_widget_modify_base): Constify.
+
+2004-01-06  Federico Mena Quintero  <federico ximian com>
+
 	* gtk/gtkfilesel.c (gtk_file_selection_create_dir_confirmed): Use
 	0777 as the mode for mkdir() and let the umask do the right
 	thing.  Fixes #121819.
Index: gdk/gdkcursor.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkcursor.h,v
retrieving revision 1.9
diff -u -r1.9 gdkcursor.h
--- gdk/gdkcursor.h	30 Jun 2003 22:30:53 -0000	1.9
+++ gdk/gdkcursor.h	7 Jan 2004 00:42:54 -0000
@@ -113,8 +113,8 @@
 #endif
 GdkCursor* gdk_cursor_new_from_pixmap	 (GdkPixmap	  *source,
 					  GdkPixmap	  *mask,
-					  GdkColor	  *fg,
-					  GdkColor	  *bg,
+					  const GdkColor  *fg,
+					  const GdkColor  *bg,
 					  gint		   x,
 					  gint		   y);
 GdkCursor* gdk_cursor_new_from_pixbuf	 (GdkDisplay      *display,
Index: gdk/gdkdrawable.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkdrawable.h,v
retrieving revision 1.25
diff -u -r1.25 gdkdrawable.h
--- gdk/gdkdrawable.h	17 Nov 2003 23:16:47 -0000	1.25
+++ gdk/gdkdrawable.h	7 Jan 2004 00:42:54 -0000
@@ -328,15 +328,15 @@
                                        gint             x,
                                        gint             y,
                                        PangoLayoutLine *line,
-                                       GdkColor        *foreground,
-                                       GdkColor        *background);
+                                       const GdkColor  *foreground,
+                                       const GdkColor  *background);
 void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
                                        GdkGC           *gc,
                                        gint             x,
                                        gint             y,
                                        PangoLayout     *layout,
-                                       GdkColor        *foreground,
-                                       GdkColor        *background);
+                                       const GdkColor  *foreground,
+                                       const GdkColor  *background);
 
 #ifndef GDK_DISABLE_DEPRECATED
 #define gdk_draw_pixmap                gdk_draw_drawable
Index: gdk/gdkgc.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkgc.c,v
retrieving revision 1.39
diff -u -r1.39 gdkgc.c
--- gdk/gdkgc.c	25 Sep 2002 07:23:52 -0000	1.39
+++ gdk/gdkgc.c	7 Jan 2004 00:42:54 -0000
@@ -199,8 +199,8 @@
 }
 
 void
-gdk_gc_set_foreground (GdkGC	*gc,
-		       GdkColor *color)
+gdk_gc_set_foreground (GdkGC	      *gc,
+		       const GdkColor *color)
 {
   GdkGCValues values;
 
@@ -212,8 +212,8 @@
 }
 
 void
-gdk_gc_set_background (GdkGC	*gc,
-		       GdkColor *color)
+gdk_gc_set_background (GdkGC	      *gc,
+		       const GdkColor *color)
 {
   GdkGCValues values;
 
@@ -496,7 +496,8 @@
  * Calling this function for a GC without a colormap is an error.
  **/
 void
-gdk_gc_set_rgb_fg_color (GdkGC *gc, GdkColor *color)
+gdk_gc_set_rgb_fg_color (GdkGC          *gc,
+			 const GdkColor *color)
 {
   GdkColormap *cmap;
   GdkColor tmp_color;
@@ -527,7 +528,8 @@
  * Calling this function for a GC without a colormap is an error.
  **/
 void
-gdk_gc_set_rgb_bg_color (GdkGC *gc, GdkColor *color)
+gdk_gc_set_rgb_bg_color (GdkGC          *gc,
+			 const GdkColor *color)
 {
   GdkColormap *cmap;
   GdkColor tmp_color;
Index: gdk/gdkgc.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkgc.h,v
retrieving revision 1.13
diff -u -r1.13 gdkgc.h
--- gdk/gdkgc.h	25 Apr 2002 22:29:10 -0000	1.13
+++ gdk/gdkgc.h	7 Jan 2004 00:42:54 -0000
@@ -209,9 +209,9 @@
                                    GdkGCValues	   *values,
                                    GdkGCValuesMask  values_mask);
 void   gdk_gc_set_foreground	  (GdkGC	    *gc,
-				   GdkColor	    *color);
+				   const GdkColor   *color);
 void   gdk_gc_set_background	  (GdkGC	    *gc,
-				   GdkColor	    *color);
+				   const GdkColor   *color);
 #ifndef GDK_DISABLE_DEPRECATED
 void   gdk_gc_set_font		  (GdkGC	    *gc,
 				   GdkFont	    *font);
@@ -256,14 +256,14 @@
 				   GdkGC	    *src_gc);
 
 
-void         gdk_gc_set_colormap     (GdkGC       *gc,
-				      GdkColormap *colormap);
-GdkColormap *gdk_gc_get_colormap     (GdkGC       *gc);
-void         gdk_gc_set_rgb_fg_color (GdkGC       *gc,
-				      GdkColor    *color);
-void         gdk_gc_set_rgb_bg_color (GdkGC       *gc,
-				      GdkColor    *color);
-GdkScreen *  gdk_gc_get_screen	     (GdkGC       *gc);
+void         gdk_gc_set_colormap     (GdkGC          *gc,
+				      GdkColormap    *colormap);
+GdkColormap *gdk_gc_get_colormap     (GdkGC          *gc);
+void         gdk_gc_set_rgb_fg_color (GdkGC          *gc,
+				      const GdkColor *color);
+void         gdk_gc_set_rgb_bg_color (GdkGC          *gc,
+				      const GdkColor *color);
+GdkScreen *  gdk_gc_get_screen	     (GdkGC          *gc);
 
 #ifndef GDK_DISABLE_DEPRECATED
 #define gdk_gc_destroy                 gdk_gc_unref
Index: gdk/gdkpango.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkpango.c,v
retrieving revision 1.27
diff -u -r1.27 gdkpango.c
--- gdk/gdkpango.c	11 Sep 2003 22:09:37 -0000	1.27
+++ gdk/gdkpango.c	7 Jan 2004 00:42:55 -0000
@@ -214,8 +214,8 @@
                                   gint              x, 
                                   gint              y,
                                   PangoLayoutLine  *line,
-                                  GdkColor         *foreground,
-                                  GdkColor         *background)
+                                  const GdkColor   *foreground,
+                                  const GdkColor   *background)
 {
   GSList *tmp_list = line->runs;
   PangoRectangle overall_rect;
@@ -451,8 +451,8 @@
                              int              x, 
                              int              y,
                              PangoLayout     *layout,
-                             GdkColor        *foreground,
-                             GdkColor        *background)
+                             const GdkColor  *foreground,
+                             const GdkColor  *background)
 {
   PangoLayoutIter *iter;
   
Index: gdk/gdkpixmap.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkpixmap.c,v
retrieving revision 1.48
diff -u -r1.48 gdkpixmap.c
--- gdk/gdkpixmap.c	17 Nov 2003 23:16:47 -0000	1.48
+++ gdk/gdkpixmap.c	7 Jan 2004 00:42:55 -0000
@@ -501,10 +501,10 @@
 			  ((c)->blue             >> 8))
 
 static GdkPixmap *
-gdk_pixmap_colormap_new_from_pixbuf (GdkColormap *colormap,
-				     GdkBitmap  **mask,
-				     GdkColor    *transparent_color,
-				     GdkPixbuf   *pixbuf)
+gdk_pixmap_colormap_new_from_pixbuf (GdkColormap    *colormap,
+				     GdkBitmap     **mask,
+				     const GdkColor *transparent_color,
+				     GdkPixbuf      *pixbuf)
 {
   GdkPixmap *pixmap;
   GdkPixbuf *render_pixbuf;
@@ -551,11 +551,11 @@
 }
 
 GdkPixmap*
-gdk_pixmap_colormap_create_from_xpm (GdkDrawable *drawable,
-				     GdkColormap *colormap,
-				     GdkBitmap  **mask,
-				     GdkColor    *transparent_color,
-				     const gchar *filename)
+gdk_pixmap_colormap_create_from_xpm (GdkDrawable    *drawable,
+				     GdkColormap    *colormap,
+				     GdkBitmap     **mask,
+				     const GdkColor *transparent_color,
+				     const gchar    *filename)
 {
   GdkPixbuf *pixbuf;
   GdkPixmap *pixmap;
@@ -579,21 +579,21 @@
 }
 
 GdkPixmap*
-gdk_pixmap_create_from_xpm (GdkDrawable *drawable,
-			    GdkBitmap  **mask,
-			    GdkColor    *transparent_color,
-			    const gchar *filename)
+gdk_pixmap_create_from_xpm (GdkDrawable    *drawable,
+			    GdkBitmap     **mask,
+			    const GdkColor *transparent_color,
+			    const gchar    *filename)
 {
   return gdk_pixmap_colormap_create_from_xpm (drawable, NULL, mask,
 					      transparent_color, filename);
 }
 
 GdkPixmap*
-gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable,
-				       GdkColormap *colormap,
-				       GdkBitmap **mask,
-				       GdkColor   *transparent_color,
-				       gchar     **data)
+gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable    *drawable,
+				       GdkColormap    *colormap,
+				       GdkBitmap     **mask,
+				       const GdkColor *transparent_color,
+				       gchar         **data)
 {
   GdkPixbuf *pixbuf;
   GdkPixmap *pixmap;
@@ -617,10 +617,10 @@
 }
 
 GdkPixmap*
-gdk_pixmap_create_from_xpm_d (GdkDrawable *drawable,
-			      GdkBitmap  **mask,
-			      GdkColor    *transparent_color,
-			      gchar      **data)
+gdk_pixmap_create_from_xpm_d (GdkDrawable    *drawable,
+			      GdkBitmap     **mask,
+			      const GdkColor *transparent_color,
+			      gchar         **data)
 {
   return gdk_pixmap_colormap_create_from_xpm_d (drawable, NULL, mask,
 						transparent_color, data);
Index: gdk/gdkpixmap.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkpixmap.h,v
retrieving revision 1.14
diff -u -r1.14 gdkpixmap.h
--- gdk/gdkpixmap.h	9 Dec 2002 23:34:48 -0000	1.14
+++ gdk/gdkpixmap.h	7 Jan 2004 00:42:55 -0000
@@ -46,32 +46,32 @@
 					 const gchar *data,
 					 gint	      width,
 					 gint	      height);
-GdkPixmap* gdk_pixmap_create_from_data	(GdkDrawable *drawable,
-					 const gchar *data,
-					 gint	      width,
-					 gint	      height,
-					 gint	      depth,
-					 GdkColor    *fg,
-					 GdkColor    *bg);
-
-GdkPixmap* gdk_pixmap_create_from_xpm            (GdkDrawable  *drawable,
-						  GdkBitmap   **mask,
-						  GdkColor     *transparent_color,
-						  const gchar  *filename);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm   (GdkDrawable  *drawable,
-						  GdkColormap  *colormap,
-						  GdkBitmap   **mask,
-						  GdkColor     *transparent_color,
-						  const gchar  *filename);
-GdkPixmap* gdk_pixmap_create_from_xpm_d          (GdkDrawable  *drawable,
-						  GdkBitmap   **mask,
-						  GdkColor     *transparent_color,
-						  gchar       **data);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable  *drawable,
-						  GdkColormap  *colormap,
-						  GdkBitmap   **mask,
-						  GdkColor     *transparent_color,
-						  gchar       **data);
+GdkPixmap* gdk_pixmap_create_from_data	(GdkDrawable    *drawable,
+					 const gchar 	*data,
+					 gint	     	 width,
+					 gint	     	 height,
+					 gint	         depth,
+					 const GdkColor *fg,
+					 const GdkColor *bg);
+
+GdkPixmap* gdk_pixmap_create_from_xpm            (GdkDrawable    *drawable,
+						  GdkBitmap     **mask,
+						  const GdkColor *transparent_color,
+						  const gchar    *filename);
+GdkPixmap* gdk_pixmap_colormap_create_from_xpm   (GdkDrawable    *drawable,
+						  GdkColormap    *colormap,
+						  GdkBitmap     **mask,
+						  const GdkColor *transparent_color,
+						  const gchar    *filename);
+GdkPixmap* gdk_pixmap_create_from_xpm_d          (GdkDrawable    *drawable,
+						  GdkBitmap     **mask,
+						  const GdkColor *transparent_color,
+						  gchar         **data);
+GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable    *drawable,
+						  GdkColormap    *colormap,
+						  GdkBitmap     **mask,
+						  const GdkColor *transparent_color,
+						  gchar         **data);
 
 /* Functions to create/lookup pixmaps from their native equivalents
  */
Index: gdk/gdkwindow.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.h,v
retrieving revision 1.48
diff -u -r1.48 gdkwindow.h
--- gdk/gdkwindow.h	10 Dec 2003 23:57:40 -0000	1.48
+++ gdk/gdkwindow.h	7 Jan 2004 00:42:55 -0000
@@ -432,7 +432,7 @@
 void          gdk_window_set_transient_for (GdkWindow       *window, 
 					    GdkWindow       *parent);
 void	      gdk_window_set_background	 (GdkWindow	  *window,
-					  GdkColor	  *color);
+					  const GdkColor  *color);
 void	      gdk_window_set_back_pixmap (GdkWindow	  *window,
 					  GdkPixmap	  *pixmap,
 					  gboolean	   parent_relative);
Index: gdk/linux-fb/gdkcursor-fb.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/linux-fb/gdkcursor-fb.c,v
retrieving revision 1.14
diff -u -r1.14 gdkcursor-fb.c
--- gdk/linux-fb/gdkcursor-fb.c	10 Sep 2002 15:19:13 -0000	1.14
+++ gdk/linux-fb/gdkcursor-fb.c	7 Jan 2004 00:42:55 -0000
@@ -246,12 +246,12 @@
 }
 
 GdkCursor*
-gdk_cursor_new_from_pixmap (GdkPixmap *source,
-			    GdkPixmap *mask,
-			    GdkColor  *fg,
-			    GdkColor  *bg,
-			    gint       x,
-			    gint       y)
+gdk_cursor_new_from_pixmap (GdkPixmap      *source,
+			    GdkPixmap      *mask,
+			    const GdkColor *fg,
+			    const GdkColor *bg,
+			    gint            x,
+			    gint            y)
 {
   GdkCursorPrivateFB *private;
   GdkCursor *cursor;
Index: gdk/linux-fb/gdkpixmap-fb.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/linux-fb/gdkpixmap-fb.c,v
retrieving revision 1.11
diff -u -r1.11 gdkpixmap-fb.c
--- gdk/linux-fb/gdkpixmap-fb.c	9 Dec 2002 23:34:48 -0000	1.11
+++ gdk/linux-fb/gdkpixmap-fb.c	7 Jan 2004 00:42:55 -0000
@@ -170,13 +170,13 @@
 }
 
 GdkPixmap*
-gdk_pixmap_create_from_data (GdkDrawable *window,
-			     const gchar *data,
-			     gint         width,
-			     gint         height,
-			     gint         depth,
-			     GdkColor    *fg,
-			     GdkColor    *bg)
+gdk_pixmap_create_from_data (GdkDrawable    *window,
+			     const gchar    *data,
+			     gint            width,
+			     gint            height,
+			     gint            depth,
+			     const GdkColor *fg,
+			     const GdkColor *bg)
 {
   GdkPixmap *pixmap;
 
Index: gdk/linux-fb/gdkwindow-fb.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/linux-fb/gdkwindow-fb.c,v
retrieving revision 1.54
diff -u -r1.54 gdkwindow-fb.c
--- gdk/linux-fb/gdkwindow-fb.c	10 Dec 2003 23:57:43 -0000	1.54
+++ gdk/linux-fb/gdkwindow-fb.c	7 Jan 2004 00:42:56 -0000
@@ -1440,8 +1440,8 @@
 }
 
 void
-gdk_window_set_background (GdkWindow *window,
-			   GdkColor  *color)
+gdk_window_set_background (const GdkWindow *window,
+			   const GdkColor  *color)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
   
Index: gdk/win32/gdkcursor-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/win32/gdkcursor-win32.c,v
retrieving revision 1.31
diff -u -r1.31 gdkcursor-win32.c
--- gdk/win32/gdkcursor-win32.c	28 Jun 2003 01:12:50 -0000	1.31
+++ gdk/win32/gdkcursor-win32.c	7 Jan 2004 00:42:56 -0000
@@ -119,12 +119,12 @@
 }
 
 GdkCursor*
-gdk_cursor_new_from_pixmap (GdkPixmap *source,
-			    GdkPixmap *mask,
-			    GdkColor  *fg,
-			    GdkColor  *bg,
-			    gint       x,
-			    gint       y)
+gdk_cursor_new_from_pixmap (GdkPixmap      *source,
+			    GdkPixmap      *mask,
+			    const GdkColor *fg,
+			    const GdkColor *bg,
+			    gint            x,
+			    gint            y)
 {
   GdkCursorPrivate *private;
   GdkCursor *cursor;
Index: gdk/win32/gdkpixmap-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/win32/gdkpixmap-win32.c,v
retrieving revision 1.36
diff -u -r1.36 gdkpixmap-win32.c
--- gdk/win32/gdkpixmap-win32.c	6 Aug 2003 22:13:48 -0000	1.36
+++ gdk/win32/gdkpixmap-win32.c	7 Jan 2004 00:42:56 -0000
@@ -389,13 +389,13 @@
 }
 
 GdkPixmap*
-gdk_pixmap_create_from_data (GdkDrawable *drawable,
-			     const gchar *data,
-			     gint         width,
-			     gint         height,
-			     gint         depth,
-			     GdkColor    *fg,
-			     GdkColor    *bg)
+gdk_pixmap_create_from_data (GdkDrawable    *drawable,
+			     const gchar    *data,
+			     gint            width,
+			     gint            height,
+			     gint            depth,
+			     const GdkColor *fg,
+			     const GdkColor *bg)
 {
   /* Oh wow. I struggled with dozens of lines of code trying to get
    * this right using a monochrome Win32 bitmap created from data, and
Index: gdk/win32/gdkwindow-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/win32/gdkwindow-win32.c,v
retrieving revision 1.110
diff -u -r1.110 gdkwindow-win32.c
--- gdk/win32/gdkwindow-win32.c	4 Jan 2004 15:45:54 -0000	1.110
+++ gdk/win32/gdkwindow-win32.c	7 Jan 2004 00:42:57 -0000
@@ -1649,8 +1649,8 @@
 }
 
 void
-gdk_window_set_background (GdkWindow *window,
-			   GdkColor  *color)
+gdk_window_set_background (GdkWindow      *window,
+			   const GdkColor *color)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
   
Index: gdk/x11/gdkcursor-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkcursor-x11.c,v
retrieving revision 1.32
diff -u -r1.32 gdkcursor-x11.c
--- gdk/x11/gdkcursor-x11.c	24 Dec 2003 23:28:14 -0000	1.32
+++ gdk/x11/gdkcursor-x11.c	7 Jan 2004 00:42:57 -0000
@@ -188,12 +188,12 @@
  * Return value: a new #GdkCursor.
  **/
 GdkCursor*
-gdk_cursor_new_from_pixmap (GdkPixmap *source,
-			    GdkPixmap *mask,
-			    GdkColor  *fg,
-			    GdkColor  *bg,
-			    gint       x,
-			    gint       y)
+gdk_cursor_new_from_pixmap (GdkPixmap      *source,
+			    GdkPixmap      *mask,
+			    const GdkColor *fg,
+			    const GdkColor *bg,
+			    gint            x,
+			    gint            y)
 {
   GdkCursorPrivate *private;
   GdkCursor *cursor;
Index: gdk/x11/gdkpixmap-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkpixmap-x11.c,v
retrieving revision 1.58
diff -u -r1.58 gdkpixmap-x11.c
--- gdk/x11/gdkpixmap-x11.c	2 Aug 2003 17:50:09 -0000	1.58
+++ gdk/x11/gdkpixmap-x11.c	7 Jan 2004 00:42:57 -0000
@@ -256,13 +256,13 @@
 }
 
 GdkPixmap*
-gdk_pixmap_create_from_data (GdkDrawable *drawable,
-			     const gchar *data,
-			     gint         width,
-			     gint         height,
-			     gint         depth,
-			     GdkColor    *fg,
-			     GdkColor    *bg)
+gdk_pixmap_create_from_data (GdkDrawable    *drawable,
+			     const gchar    *data,
+			     gint            width,
+			     gint            height,
+			     gint            depth,
+			     const GdkColor *fg,
+			     const GdkColor *bg)
 {
   GdkPixmap *pixmap;
   GdkDrawableImplX11 *draw_impl;
Index: gdk/x11/gdkwindow-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.c,v
retrieving revision 1.198
diff -u -r1.198 gdkwindow-x11.c
--- gdk/x11/gdkwindow-x11.c	21 Dec 2003 16:37:43 -0000	1.198
+++ gdk/x11/gdkwindow-x11.c	7 Jan 2004 00:42:58 -0000
@@ -2400,8 +2400,8 @@
  * 
  **/
 void
-gdk_window_set_background (GdkWindow *window,
-			   GdkColor  *color)
+gdk_window_set_background (GdkWindow      *window,
+			   const GdkColor *color)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
   
Index: gtk/gtkcellview.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcellview.c,v
retrieving revision 1.9
diff -u -r1.9 gtkcellview.c
--- gtk/gtkcellview.c	19 Dec 2003 22:47:20 -0000	1.9
+++ gtk/gtkcellview.c	7 Jan 2004 00:42:59 -0000
@@ -932,8 +932,8 @@
 }
 
 void
-gtk_cell_view_set_background_color (GtkCellView *view,
-                                    GdkColor    *color)
+gtk_cell_view_set_background_color (GtkCellView    *view,
+                                    const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_CELL_VIEW (view));
 
Index: gtk/gtkcellview.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcellview.h,v
retrieving revision 1.5
diff -u -r1.5 gtkcellview.h
--- gtk/gtkcellview.h	8 Dec 2003 22:31:34 -0000	1.5
+++ gtk/gtkcellview.h	7 Jan 2004 00:42:59 -0000
@@ -75,7 +75,7 @@
                                                          GtkRequisition  *requisition);
 
 void              gtk_cell_view_set_background_color    (GtkCellView     *cell_view,
-                                                         GdkColor        *color);
+                                                         const GdkColor  *color);
 
 G_END_DECLS
 
Index: gtk/gtkclist.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkclist.c,v
retrieving revision 1.227
diff -u -r1.227 gtkclist.c
--- gtk/gtkclist.c	17 Dec 2003 22:23:30 -0000	1.227
+++ gtk/gtkclist.c	7 Jan 2004 00:43:00 -0000
@@ -3215,9 +3215,9 @@
 }
 
 void
-gtk_clist_set_foreground (GtkCList *clist,
-			  gint      row,
-			  GdkColor *color)
+gtk_clist_set_foreground (GtkCList       *clist,
+			  gint            row,
+			  const GdkColor *color)
 {
   GtkCListRow *clist_row;
 
@@ -3244,9 +3244,9 @@
 }
 
 void
-gtk_clist_set_background (GtkCList *clist,
-			  gint      row,
-			  GdkColor *color)
+gtk_clist_set_background (GtkCList       *clist,
+			  gint            row,
+			  const GdkColor *color)
 {
   GtkCListRow *clist_row;
 
Index: gtk/gtkclist.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkclist.h,v
retrieving revision 1.57
diff -u -r1.57 gtkclist.h
--- gtk/gtkclist.h	24 Apr 2001 14:58:32 -0000	1.57
+++ gtk/gtkclist.h	7 Jan 2004 00:43:01 -0000
@@ -631,16 +631,16 @@
 /* sets the foreground color of a row, the color must already
  * be allocated
  */
-void gtk_clist_set_foreground (GtkCList *clist,
-			       gint      row,
-			       GdkColor *color);
+void gtk_clist_set_foreground (GtkCList       *clist,
+			       gint            row,
+			       const GdkColor *color);
 
 /* sets the background color of a row, the color must already
  * be allocated
  */
-void gtk_clist_set_background (GtkCList *clist,
-			       gint      row,
-			       GdkColor *color);
+void gtk_clist_set_background (GtkCList       *clist,
+			       gint            row,
+			       const GdkColor *color);
 
 /* set / get cell styles */
 void gtk_clist_set_cell_style (GtkCList *clist,
Index: gtk/gtkcolorbutton.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcolorbutton.c,v
retrieving revision 1.4
diff -u -r1.4 gtkcolorbutton.c
--- gtk/gtkcolorbutton.c	5 Nov 2003 23:23:05 -0000	1.4
+++ gtk/gtkcolorbutton.c	7 Jan 2004 00:43:01 -0000
@@ -660,7 +660,7 @@
  * Since: 2.4
  */
 GtkWidget *
-gtk_color_button_new_with_color (GdkColor *color)
+gtk_color_button_new_with_color (const GdkColor *color)
 {
   return g_object_new (GTK_TYPE_COLOR_BUTTON, "color", color, NULL);
 }
@@ -776,7 +776,7 @@
  **/
 void
 gtk_color_button_set_color (GtkColorButton *color_button,
-			    GdkColor       *color)
+			    const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
 
Index: gtk/gtkcolorbutton.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcolorbutton.h,v
retrieving revision 1.2
diff -u -r1.2 gtkcolorbutton.h
--- gtk/gtkcolorbutton.h	30 Sep 2003 22:48:10 -0000	1.2
+++ gtk/gtkcolorbutton.h	7 Jan 2004 00:43:01 -0000
@@ -77,9 +77,9 @@
 
 GType      gtk_color_button_get_type       (void) G_GNUC_CONST;
 GtkWidget *gtk_color_button_new            (void);
-GtkWidget *gtk_color_button_new_with_color (GdkColor       *color);
+GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
 void       gtk_color_button_set_color      (GtkColorButton *color_button, 
-					    GdkColor       *color);
+					    const GdkColor *color);
 void       gtk_color_button_set_alpha      (GtkColorButton *color_button,
 					    guint16         alpha);
 void       gtk_color_button_get_color      (GtkColorButton *color_button, 
Index: gtk/gtkcolorsel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcolorsel.c,v
retrieving revision 1.116
diff -u -r1.116 gtkcolorsel.c
--- gtk/gtkcolorsel.c	12 Nov 2003 09:22:48 -0000	1.116
+++ gtk/gtkcolorsel.c	7 Jan 2004 00:43:02 -0000
@@ -2209,13 +2209,14 @@
  **/
 void
 gtk_color_selection_set_current_color (GtkColorSelection *colorsel,
-				       GdkColor          *color)
+				       const GdkColor    *color)
 {
   ColorSelectionPrivate *priv;
   gint i;
   gboolean previous_changed;
   
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  g_return_if_fail (color != NULL);
 
   priv = colorsel->private_data;
   priv->changing = TRUE;
@@ -2301,6 +2302,7 @@
   ColorSelectionPrivate *priv;
   
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  g_return_if_fail (color != NULL);
   
   priv = colorsel->private_data;
   color->red = UNSCALE (priv->color[COLORSEL_RED]);
@@ -2363,11 +2365,12 @@
  **/
 void
 gtk_color_selection_set_previous_color (GtkColorSelection *colorsel,
-					GdkColor          *color)
+					const GdkColor    *color)
 {
   ColorSelectionPrivate *priv;
   
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  g_return_if_fail (color != NULL);
   
   priv = colorsel->private_data;
   priv->changing = TRUE;
@@ -2424,6 +2427,7 @@
   ColorSelectionPrivate *priv;
   
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  g_return_if_fail (color != NULL);
   
   priv = colorsel->private_data;
   color->red = UNSCALE (priv->old_color[COLORSEL_RED]);
Index: gtk/gtkcolorsel.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcolorsel.h,v
retrieving revision 1.26
diff -u -r1.26 gtkcolorsel.h
--- gtk/gtkcolorsel.h	31 Jan 2003 00:37:38 -0000	1.26
+++ gtk/gtkcolorsel.h	7 Jan 2004 00:43:02 -0000
@@ -88,14 +88,14 @@
 
 
 void     gtk_color_selection_set_current_color   (GtkColorSelection *colorsel,
-						  GdkColor          *color);
+						  const GdkColor    *color);
 void     gtk_color_selection_set_current_alpha   (GtkColorSelection *colorsel,
 						  guint16            alpha);
 void     gtk_color_selection_get_current_color   (GtkColorSelection *colorsel,
 						  GdkColor          *color);
 guint16  gtk_color_selection_get_current_alpha   (GtkColorSelection *colorsel);
 void     gtk_color_selection_set_previous_color  (GtkColorSelection *colorsel,
-						  GdkColor          *color);
+						  const GdkColor    *color);
 void     gtk_color_selection_set_previous_alpha  (GtkColorSelection *colorsel,
 						  guint16            alpha);
 void     gtk_color_selection_get_previous_color  (GtkColorSelection *colorsel,
Index: gtk/gtkctree.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkctree.c,v
retrieving revision 1.107
diff -u -r1.107 gtkctree.c
--- gtk/gtkctree.c	3 Sep 2003 19:57:05 -0000	1.107
+++ gtk/gtkctree.c	7 Jan 2004 00:43:03 -0000
@@ -5099,9 +5099,9 @@
 }
 
 void
-gtk_ctree_node_set_foreground (GtkCTree     *ctree,
-			       GtkCTreeNode *node,
-			       GdkColor     *color)
+gtk_ctree_node_set_foreground (GtkCTree       *ctree,
+			       GtkCTreeNode   *node,
+			       const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
@@ -5121,9 +5121,9 @@
 }
 
 void
-gtk_ctree_node_set_background (GtkCTree     *ctree,
-			       GtkCTreeNode *node,
-			       GdkColor     *color)
+gtk_ctree_node_set_background (GtkCTree       *ctree,
+			       GtkCTreeNode   *node,
+			       const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_CTREE (ctree));
   g_return_if_fail (node != NULL);
Index: gtk/gtkctree.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkctree.h,v
retrieving revision 1.36
diff -u -r1.36 gtkctree.h
--- gtk/gtkctree.h	25 Sep 2001 01:12:08 -0000	1.36
+++ gtk/gtkctree.h	7 Jan 2004 00:43:03 -0000
@@ -382,12 +382,12 @@
 GtkStyle * gtk_ctree_node_get_cell_style         (GtkCTree     *ctree,
 						  GtkCTreeNode *node,
 						  gint          column);
-void gtk_ctree_node_set_foreground               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  GdkColor     *color);
-void gtk_ctree_node_set_background               (GtkCTree     *ctree,
-						  GtkCTreeNode *node,
-						  GdkColor     *color);
+void gtk_ctree_node_set_foreground               (GtkCTree       *ctree,
+						  GtkCTreeNode   *node,
+						  const GdkColor *color);
+void gtk_ctree_node_set_background               (GtkCTree       *ctree,
+						  GtkCTreeNode   *node,
+						  const GdkColor *color);
 void gtk_ctree_node_set_row_data                 (GtkCTree     *ctree,
 						  GtkCTreeNode *node,
 						  gpointer      data);
Index: gtk/gtktext.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktext.c,v
retrieving revision 1.118
diff -u -r1.118 gtktext.c
--- gtk/gtktext.c	5 Feb 2003 23:48:10 -0000	1.118
+++ gtk/gtktext.c	7 Jan 2004 00:43:05 -0000
@@ -267,9 +267,9 @@
 static void         text_font_unref (GtkTextFont *text_font);
 
 static void insert_text_property (GtkText* text, GdkFont* font,
-				  GdkColor *fore, GdkColor* back, guint len);
+				  const GdkColor *fore, const GdkColor* back, guint len);
 static TextProperty* new_text_property (GtkText *text, GdkFont* font, 
-					GdkColor* fore, GdkColor* back, guint length);
+					const GdkColor* fore, const GdkColor* back, guint length);
 static void destroy_text_property (TextProperty *prop);
 static void init_properties      (GtkText *text);
 static void realize_property     (GtkText *text, TextProperty *prop);
@@ -958,12 +958,12 @@
 }
 
 void
-gtk_text_insert (GtkText    *text,
-		 GdkFont    *font,
-		 GdkColor   *fore,
-		 GdkColor   *back,
-		 const char *chars,
-		 gint        nchars)
+gtk_text_insert (GtkText        *text,
+		 GdkFont        *font,
+		 const GdkColor *fore,
+		 const GdkColor *back,
+		 const char     *chars,
+		 gint            nchars)
 {
   GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
   gboolean frozen = FALSE;
@@ -2876,7 +2876,7 @@
 }
 
 static gint
-text_properties_equal (TextProperty* prop, GdkFont* font, GdkColor *fore, GdkColor *back)
+text_properties_equal (TextProperty* prop, GdkFont* font, const GdkColor *fore, const GdkColor *back)
 {
   if (prop->flags & PROPERTY_FONT)
     {
@@ -2970,8 +2970,8 @@
 }
 
 static TextProperty*
-new_text_property (GtkText *text, GdkFont *font, GdkColor* fore, 
-		   GdkColor* back, guint length)
+new_text_property (GtkText *text, GdkFont *font, const GdkColor* fore,
+		   const GdkColor* back, guint length)
 {
   TextProperty *prop;
   
@@ -3104,7 +3104,7 @@
  * point. */
 static void
 insert_text_property (GtkText* text, GdkFont* font,
-		      GdkColor *fore, GdkColor* back, guint len)
+		      const GdkColor *fore, const GdkColor* back, guint len)
 {
   GtkPropertyMark *mark = &text->point;
   TextProperty* forward_prop = MARK_CURRENT_PROPERTY(mark);
Index: gtk/gtktext.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktext.h,v
retrieving revision 1.27
diff -u -r1.27 gtktext.h
--- gtk/gtktext.h	16 Mar 2001 20:12:40 -0000	1.27
+++ gtk/gtktext.h	7 Jan 2004 00:43:05 -0000
@@ -197,12 +197,12 @@
 guint      gtk_text_get_length      (GtkText       *text);
 void       gtk_text_freeze          (GtkText       *text);
 void       gtk_text_thaw            (GtkText       *text);
-void       gtk_text_insert          (GtkText       *text,
-				     GdkFont       *font,
-				     GdkColor      *fore,
-				     GdkColor      *back,
-				     const char    *chars,
-				     gint           length);
+void       gtk_text_insert          (GtkText        *text,
+				     GdkFont        *font,
+				     const GdkColor *fore,
+				     const GdkColor *back,
+				     const char     *chars,
+				     gint            length);
 gboolean   gtk_text_backward_delete (GtkText       *text,
 				     guint          nchars);
 gboolean   gtk_text_forward_delete  (GtkText       *text,
Index: gtk/gtkwidget.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwidget.c,v
retrieving revision 1.363
diff -u -r1.363 gtkwidget.c
--- gtk/gtkwidget.c	18 Dec 2003 00:39:16 -0000	1.363
+++ gtk/gtkwidget.c	7 Jan 2004 00:43:07 -0000
@@ -4469,10 +4469,10 @@
 }
 
 static void
-gtk_widget_modify_color_component (GtkWidget     *widget,
-				   GtkRcFlags     component,
-				   GtkStateType   state,
-				   GdkColor      *color)
+gtk_widget_modify_color_component (GtkWidget      *widget,
+				   GtkRcFlags      component,
+				   GtkStateType    state,
+				   const GdkColor *color)
 {
   GtkRcStyle *rc_style = gtk_widget_get_modifier_style (widget);  
 
@@ -4517,9 +4517,9 @@
  * gtk_widget_modify_style().
  **/
 void
-gtk_widget_modify_fg (GtkWidget   *widget,
-		      GtkStateType state,
-		      GdkColor    *color)
+gtk_widget_modify_fg (GtkWidget      *widget,
+		      GtkStateType    state,
+		      const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
@@ -4540,9 +4540,9 @@
  * gtk_widget_modify_style().
  **/
 void
-gtk_widget_modify_bg (GtkWidget   *widget,
-		      GtkStateType state,
-		      GdkColor    *color)
+gtk_widget_modify_bg (GtkWidget      *widget,
+		      GtkStateType    state,
+		      const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
@@ -4565,9 +4565,9 @@
  * gtk_widget_modify_style().
  **/
 void
-gtk_widget_modify_text (GtkWidget   *widget,
-			GtkStateType state,
-			GdkColor    *color)
+gtk_widget_modify_text (GtkWidget      *widget,
+			GtkStateType    state,
+			const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
@@ -4590,9 +4590,9 @@
  * and #GtkTextView. See also gtk_widget_modify_style().
  **/
 void
-gtk_widget_modify_base (GtkWidget  *widget,
-			GtkStateType state,
-			GdkColor    *color)
+gtk_widget_modify_base (GtkWidget      *widget,
+			GtkStateType    state,
+			const GdkColor *color)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
Index: gtk/gtkwidget.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwidget.h,v
retrieving revision 1.146
diff -u -r1.146 gtkwidget.h
--- gtk/gtkwidget.h	27 Nov 2003 15:51:32 -0000	1.146
+++ gtk/gtkwidget.h	7 Jan 2004 00:43:07 -0000
@@ -650,16 +650,16 @@
 GtkRcStyle *gtk_widget_get_modifier_style (GtkWidget            *widget);
 void        gtk_widget_modify_fg          (GtkWidget            *widget,
 					   GtkStateType          state,
-					   GdkColor             *color);
+					   const GdkColor       *color);
 void        gtk_widget_modify_bg          (GtkWidget            *widget,
 					   GtkStateType          state,
-					   GdkColor             *color);
+					   const GdkColor       *color);
 void        gtk_widget_modify_text        (GtkWidget            *widget,
 					   GtkStateType          state,
-					   GdkColor             *color);
+					   const GdkColor       *color);
 void        gtk_widget_modify_base        (GtkWidget            *widget,
 					   GtkStateType          state,
-					   GdkColor             *color);
+					   const GdkColor       *color);
 void        gtk_widget_modify_font        (GtkWidget            *widget,
 					   PangoFontDescription *font_desc);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]