diff options
author | Christian Dywan <christian@twotoasts.de> | 2009-10-07 18:18:16 +0200 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2010-05-03 01:40:41 +0200 |
commit | aa21bd702fcccb95cf0b1c31324329c47c2d3138 (patch) | |
tree | c8675c74fe14aa11868c8379bddafd6bbb8afae1 /gtk | |
parent | d974436aec4e277321efca21335f6312c291a3ea (diff) | |
download | gtk+-aa21bd702fcccb95cf0b1c31324329c47c2d3138.tar.gz |
Remove deprecated GtkColorSelection functions
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkcolorsel.c | 71 | ||||
-rw-r--r-- | gtk/gtkcolorsel.h | 16 |
2 files changed, 0 insertions, 87 deletions
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index d7375c28e2..dd14751015 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 fedb029588..611a7553ce 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__ */ |