[gtk+/gtk-2-90: 31/161] Remove deprecated GtkColorSelection functions
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-90: 31/161] Remove deprecated GtkColorSelection functions
- Date: Tue, 23 Mar 2010 21:06:07 +0000 (UTC)
commit 03644530d62c4e2ecd4de13d076e263e86f4938e
Author: Christian Dywan <christian twotoasts de>
Date: Wed Oct 7 18:18:16 2009 +0200
Remove deprecated GtkColorSelection functions
gtk/gtkcolorsel.c | 71 -----------------------------------------------------
gtk/gtkcolorsel.h | 16 ------------
2 files changed, 0 insertions(+), 87 deletions(-)
---
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index d7375c2..dd14751 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -2458,26 +2458,6 @@ gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel,
}
/**
- * gtk_color_selection_set_color:
- * @colorsel: a #GtkColorSelection.
- * @color: an array of 4 doubles specifying the red, green, blue and opacity
- * to set the current color to.
- *
- * Sets the current color to be @color. The first time this is called, it will
- * also set the original color to be @color too.
- *
- * Deprecated: 2.0: Use gtk_color_selection_set_current_color() instead.
- **/
-void
-gtk_color_selection_set_color (GtkColorSelection *colorsel,
- gdouble *color)
-{
- g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
-
- set_color_internal (colorsel, color);
-}
-
-/**
* gtk_color_selection_get_current_color:
* @colorsel: a #GtkColorSelection.
* @color: a #GdkColor to fill in with the current color.
@@ -2519,30 +2499,6 @@ gtk_color_selection_get_current_alpha (GtkColorSelection *colorsel)
}
/**
- * gtk_color_selection_get_color:
- * @colorsel: a #GtkColorSelection.
- * @color: an array of 4 #gdouble to fill in with the current color.
- *
- * Sets @color to be the current color in the GtkColorSelection widget.
- *
- * Deprecated: 2.0: Use gtk_color_selection_get_current_color() instead.
- **/
-void
-gtk_color_selection_get_color (GtkColorSelection *colorsel,
- gdouble *color)
-{
- ColorSelectionPrivate *priv;
-
- g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
-
- priv = colorsel->private_data;
- color[0] = priv->color[COLORSEL_RED];
- color[1] = priv->color[COLORSEL_GREEN];
- color[2] = priv->color[COLORSEL_BLUE];
- color[3] = priv->has_opacity ? priv->color[COLORSEL_OPACITY] : 65535;
-}
-
-/**
* gtk_color_selection_set_previous_color:
* @colorsel: a #GtkColorSelection.
* @color: a #GdkColor to set the previous color with.
@@ -2831,33 +2787,6 @@ gtk_color_selection_palette_to_string (const GdkColor *colors,
}
/**
- * gtk_color_selection_set_change_palette_hook:
- * @func: a function to call when the custom palette needs saving.
- *
- * Installs a global function to be called whenever the user tries to
- * modify the palette in a color selection. This function should save
- * the new palette contents, and update the GtkSettings property
- * "gtk-color-palette" so all GtkColorSelection widgets will be modified.
- *
- * Return value: the previous change palette hook (that was replaced).
- *
- * Deprecated: 2.4: This function does not work in multihead environments.
- * Use gtk_color_selection_set_change_palette_with_screen_hook() instead.
- *
- **/
-GtkColorSelectionChangePaletteFunc
-gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func)
-{
- GtkColorSelectionChangePaletteFunc old;
-
- old = noscreen_change_palette_hook;
-
- noscreen_change_palette_hook = func;
-
- return old;
-}
-
-/**
* gtk_color_selection_set_change_palette_with_screen_hook:
* @func: a function to call when the custom palette needs saving.
*
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index fedb029..611a755 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -112,24 +112,8 @@ gboolean gtk_color_selection_palette_from_string (const gchar *str,
gchar* gtk_color_selection_palette_to_string (const GdkColor *colors,
gint n_colors);
-#ifndef GTK_DISABLE_DEPRECATED
-#ifndef GDK_MULTIHEAD_SAFE
-GtkColorSelectionChangePaletteFunc gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func);
-#endif
-#endif
-
GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);
-#ifndef GTK_DISABLE_DEPRECATED
-/* Deprecated calls: */
-void gtk_color_selection_set_color (GtkColorSelection *colorsel,
- gdouble *color);
-void gtk_color_selection_get_color (GtkColorSelection *colorsel,
- gdouble *color);
-void gtk_color_selection_set_update_policy (GtkColorSelection *colorsel,
- GtkUpdateType policy);
-#endif /* GTK_DISABLE_DEPRECATED */
-
G_END_DECLS
#endif /* __GTK_COLOR_SELECTION_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]