AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove deprecated GtkColorSelection functions

Browse Source
This commit is contained in:
Christian Dywan 2009-10-07 18:18:16 +02:00 committed by Javier Jardón
parent d974436aec
commit aa21bd702f
2 changed files with 0 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gtk/gtkcolorsel.c
View File

@ -2457,26 +2457,6 @@ gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel,
update_color (colorsel); update_color (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: * gtk_color_selection_get_current_color:
* @colorsel: a #GtkColorSelection. * @colorsel: a #GtkColorSelection.
@ -2518,30 +2498,6 @@ gtk_color_selection_get_current_alpha (GtkColorSelection *colorsel)
return priv->has_opacity ? UNSCALE (priv->color[COLORSEL_OPACITY]) : 65535; return priv->has_opacity ? UNSCALE (priv->color[COLORSEL_OPACITY]) : 65535;
} }
/**
* 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: * gtk_color_selection_set_previous_color:
* @colorsel: a #GtkColorSelection. * @colorsel: a #GtkColorSelection.
@ -2830,33 +2786,6 @@ gtk_color_selection_palette_to_string (const GdkColor *colors,
return retval; return retval;
} }
/**
* 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: * gtk_color_selection_set_change_palette_with_screen_hook:
* @func: a function to call when the custom palette needs saving. * @func: a function to call when the custom palette needs saving.

16
gtk/gtkcolorsel.h
View File

@ -112,24 +112,8 @@ gboolean gtk_color_selection_palette_from_string (const gchar *str,
gchar* gtk_color_selection_palette_to_string (const GdkColor *colors, gchar* gtk_color_selection_palette_to_string (const GdkColor *colors,
gint n_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); 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 G_END_DECLS
#endif /* __GTK_COLOR_SELECTION_H__ */ #endif /* __GTK_COLOR_SELECTION_H__ */