Commit 5ebb6b04 authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Federico Mena Quintero

Fix #105497; constify uses of GdkColor.

2004-01-26  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.
parent 790106c7
2004-01-26 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-26 Christian Rose <menthos@menthos.com>
* configure.in: Added "mi" to ALL_LINGUAS.
......
2004-01-26 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-26 Christian Rose <menthos@menthos.com>
* configure.in: Added "mi" to ALL_LINGUAS.
......
2004-01-26 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-26 Christian Rose <menthos@menthos.com>
* configure.in: Added "mi" to ALL_LINGUAS.
......
2004-01-26 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-26 Christian Rose <menthos@menthos.com>
* configure.in: Added "mi" to ALL_LINGUAS.
......
2004-01-26 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-26 Christian Rose <menthos@menthos.com>
* configure.in: Added "mi" to ALL_LINGUAS.
......
......@@ -113,8 +113,8 @@ GdkCursor* gdk_cursor_new (GdkCursorType cursor_type);
#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,
......
......@@ -328,15 +328,15 @@ void gdk_draw_layout_line_with_colors (GdkDrawable *drawable,
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
......
......@@ -199,8 +199,8 @@ gdk_gc_set_values (GdkGC *gc,
}
void
gdk_gc_set_foreground (GdkGC *gc,
GdkColor *color)
gdk_gc_set_foreground (GdkGC *gc,
const GdkColor *color)
{
GdkGCValues values;
......@@ -212,8 +212,8 @@ gdk_gc_set_foreground (GdkGC *gc,
}
void
gdk_gc_set_background (GdkGC *gc,
GdkColor *color)
gdk_gc_set_background (GdkGC *gc,
const GdkColor *color)
{
GdkGCValues values;
......@@ -496,7 +496,8 @@ gdk_gc_get_colormap_warn (GdkGC *gc)
* 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 @@ gdk_gc_set_rgb_fg_color (GdkGC *gc, GdkColor *color)
* 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;
......
......@@ -209,9 +209,9 @@ void gdk_gc_set_values (GdkGC *gc,
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 @@ void gdk_gc_copy (GdkGC *dst_gc,
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
......
......@@ -214,8 +214,8 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable,
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 @@ gdk_draw_layout_with_colors (GdkDrawable *drawable,
int x,
int y,
PangoLayout *layout,
GdkColor *foreground,
GdkColor *background)
const GdkColor *foreground,
const GdkColor *background)
{
PangoLayoutIter *iter;
......
......@@ -501,10 +501,10 @@ make_solid_mask (GdkScreen *screen, gint width, gint height)
((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 @@ gdk_pixmap_colormap_new_from_pixbuf (GdkColormap *colormap,
}
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 @@ gdk_pixmap_colormap_create_from_xpm (GdkDrawable *drawable,
}
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 @@ gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable *drawable,
}
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);
......
......@@ -46,32 +46,32 @@ GdkBitmap* gdk_bitmap_create_from_data (GdkDrawable *drawable,
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
*/
......
......@@ -432,7 +432,7 @@ void gdk_window_set_role (GdkWindow *window,
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);
......
......@@ -246,12 +246,12 @@ gdk_cursor_new_for_display (GdkDisplay *display,
}
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;
......
......@@ -170,13 +170,13 @@ gdk_bitmap_create_from_data (GdkDrawable *window,
}
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;
......
......@@ -1440,8 +1440,8 @@ gdk_window_set_transient_for (GdkWindow *window,
}
void
gdk_window_set_background (GdkWindow *window,
GdkColor *color)
gdk_window_set_background (const GdkWindow *window,
const GdkColor *color)
{
GdkWindowObject *private = (GdkWindowObject *)window;
......
......@@ -119,12 +119,12 @@ color_is_white (GdkColor *color)
}
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;
......
......@@ -389,13 +389,13 @@ gdk_bitmap_create_from_data (GdkDrawable *drawable,
}
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
......
......@@ -1649,8 +1649,8 @@ gdk_window_set_transient_for (GdkWindow *window,
}
void
gdk_window_set_background (GdkWindow *window,
GdkColor *color)
gdk_window_set_background (GdkWindow *window,
const GdkColor *color)
{
GdkWindowObject *private = (GdkWindowObject *)window;
......
......@@ -188,12 +188,12 @@ gdk_cursor_new_for_display (GdkDisplay *display,
* 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)