diff options
author | Federico Mena Quintero <federico@ximian.com> | 2004-01-26 20:21:09 +0000 |
---|---|---|
committer | Federico Mena Quintero <federico@src.gnome.org> | 2004-01-26 20:21:09 +0000 |
commit | 5ebb6b04f20f98f614d890afbd864bbeec04dd5d (patch) | |
tree | 0e2bc4248da49e19d54fc90c0bf4126a95046a05 /gtk | |
parent | 790106c7e75046c6d03358393d1e8b795836e24e (diff) | |
download | gdk-pixbuf-5ebb6b04f20f98f614d890afbd864bbeec04dd5d.tar.gz |
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.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkcellview.c | 4 | ||||
-rw-r--r-- | gtk/gtkcellview.h | 2 | ||||
-rw-r--r-- | gtk/gtkclist.c | 12 | ||||
-rw-r--r-- | gtk/gtkclist.h | 12 | ||||
-rw-r--r-- | gtk/gtkcolorbutton.c | 4 | ||||
-rw-r--r-- | gtk/gtkcolorbutton.h | 4 | ||||
-rw-r--r-- | gtk/gtkcolorsel.c | 8 | ||||
-rw-r--r-- | gtk/gtkcolorsel.h | 4 | ||||
-rw-r--r-- | gtk/gtkctree.c | 12 | ||||
-rw-r--r-- | gtk/gtkctree.h | 12 | ||||
-rw-r--r-- | gtk/gtktext.c | 24 | ||||
-rw-r--r-- | gtk/gtktext.h | 12 | ||||
-rw-r--r-- | gtk/gtkwidget.c | 32 | ||||
-rw-r--r-- | gtk/gtkwidget.h | 8 |
14 files changed, 77 insertions, 73 deletions
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 84cdf16b1..3ebd912a9 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -932,8 +932,8 @@ gtk_cell_view_get_size_of_row (GtkCellView *cell_view, } 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)); diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h index f8d2d8007..5212b351a 100644 --- a/gtk/gtkcellview.h +++ b/gtk/gtkcellview.h @@ -75,7 +75,7 @@ gboolean gtk_cell_view_get_size_of_row (GtkCellView *cell_v GtkRequisition *requisition); void gtk_cell_view_set_background_color (GtkCellView *cell_view, - GdkColor *color); + const GdkColor *color); G_END_DECLS diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index fe02be59d..27de2ab46 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -3215,9 +3215,9 @@ gtk_clist_row_is_visible (GtkCList *clist, } 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 @@ gtk_clist_set_foreground (GtkCList *clist, } 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; diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h index ae7cbaed6..384ee3e7d 100644 --- a/gtk/gtkclist.h +++ b/gtk/gtkclist.h @@ -631,16 +631,16 @@ gint gtk_clist_get_pixtext (GtkCList *clist, /* 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, diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index ab0e69873..27e79a6ae 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -660,7 +660,7 @@ gtk_color_button_new (void) * 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 @@ gtk_color_button_clicked (GtkButton *button) **/ void gtk_color_button_set_color (GtkColorButton *color_button, - GdkColor *color) + const GdkColor *color) { g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button)); diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h index be8ec8fe7..b6a00fdf4 100644 --- a/gtk/gtkcolorbutton.h +++ b/gtk/gtkcolorbutton.h @@ -77,9 +77,9 @@ struct _GtkColorButtonClass { 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, diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 6a5d752e6..5f4dad56e 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -2209,13 +2209,14 @@ gtk_color_selection_set_has_palette (GtkColorSelection *colorsel, **/ 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 @@ gtk_color_selection_get_current_color (GtkColorSelection *colorsel, 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 @@ gtk_color_selection_get_color (GtkColorSelection *colorsel, **/ 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 @@ gtk_color_selection_get_previous_color (GtkColorSelection *colorsel, 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]); diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index 4057ea353..dbdddf616 100644 --- a/gtk/gtkcolorsel.h +++ b/gtk/gtkcolorsel.h @@ -88,14 +88,14 @@ void gtk_color_selection_set_has_palette (GtkColorSelection *color 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, diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 2f5df8ced..c8ace0843 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -5099,9 +5099,9 @@ gtk_ctree_node_get_row_style (GtkCTree *ctree, } 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 @@ gtk_ctree_node_set_foreground (GtkCTree *ctree, } 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); diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h index 5f5594ba6..9f6bd2a7e 100644 --- a/gtk/gtkctree.h +++ b/gtk/gtkctree.h @@ -382,12 +382,12 @@ void gtk_ctree_node_set_cell_style (GtkCTree *ctree, 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); diff --git a/gtk/gtktext.c b/gtk/gtktext.c index ef304a8d9..1d09a9f03 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -267,9 +267,9 @@ static GtkTextFont* get_text_font (GdkFont* gfont); 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 @@ gtk_text_thaw (GtkText *text) } 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 @@ text_font_unref (GtkTextFont *text_font) } 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 @@ unrealize_properties (GtkText *text) } 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 @@ make_forward_space (GtkText* text, guint len) * 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); diff --git a/gtk/gtktext.h b/gtk/gtktext.h index 24c063475..c3ba9e129 100644 --- a/gtk/gtktext.h +++ b/gtk/gtktext.h @@ -197,12 +197,12 @@ guint gtk_text_get_point (GtkText *text); 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, diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 6e55c6799..f43e99434 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4481,10 +4481,10 @@ gtk_widget_get_modifier_style (GtkWidget *widget) } 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); @@ -4529,9 +4529,9 @@ gtk_widget_modify_color_component (GtkWidget *widget, * 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); @@ -4552,9 +4552,9 @@ gtk_widget_modify_fg (GtkWidget *widget, * 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); @@ -4577,9 +4577,9 @@ gtk_widget_modify_bg (GtkWidget *widget, * 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); @@ -4602,9 +4602,9 @@ gtk_widget_modify_text (GtkWidget *widget, * 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); diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index f4bd4d125..f1d8b8023 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -650,16 +650,16 @@ void gtk_widget_modify_style (GtkWidget *widget, 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); |