callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a function for converting a GdkColor to a string (#373856).

Browse Source 
2006-12-21  Matthew Barnes  <mbarnes@redhat.com>

	* docs/reference/gdk/gdk-sections.txt:
	* gdk/gdkcolor.[ch] (gdk_color_to_string): Add a function for
	converting a GdkColor to a string (#373856).

	* configure.in: Bump pango requirement to 1.15.2.
This commit is contained in:
Matthew Barnes
2006-12-21 12:34:41 +00:00
committed by Matthew Barnes
parent 410292525d
commit 96b3419dff
5 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-12-21 Matthew Barnes <mbarnes@redhat.com>
* docs/reference/gdk/gdk-sections.txt:
* gdk/gdkcolor.[ch] (gdk_color_to_string): Add a function for
converting a GdkColor to a string (#373856).
* configure.in: Bump pango requirement to 1.15.2.
2006-12-20 Matthias Clasen <mclasen@redhat.com> 2006-12-20 Matthias Clasen <mclasen@redhat.com>
* gdk/keynames.txt: Mark arrow keys as translatable. (#369506, * gdk/keynames.txt: Mark arrow keys as translatable. (#369506,

2
configure.in
View File

@ -32,7 +32,7 @@ m4_define([gtk_binary_version], [2.10.0])
# required versions of other packages # required versions of other packages
m4_define([glib_required_version], [2.12.0]) m4_define([glib_required_version], [2.12.0])
m4_define([pango_required_version], [1.12.0]) m4_define([pango_required_version], [1.15.2])
m4_define([atk_required_version], [1.9.0]) m4_define([atk_required_version], [1.9.0])
m4_define([cairo_required_version], [1.2.0]) m4_define([cairo_required_version], [1.2.0])

1
docs/reference/gdk/gdk-sections.txt
View File

@ -385,6 +385,7 @@ gdk_color_alloc
gdk_color_change gdk_color_change
gdk_color_equal gdk_color_equal
gdk_color_hash gdk_color_hash
gdk_color_to_string
<SUBSECTION Standard> <SUBSECTION Standard>
GDK_COLORMAP GDK_COLORMAP

27
gdk/gdkcolor.c
View File

@ -348,6 +348,33 @@ gdk_color_parse (const gchar *spec,
return FALSE; return FALSE;
} }
/**
* gdk_color_to_string:
* @color: a #GdkColor
*
* Returns a textual specification of @color in the hexadecimal form
* <literal>&num;rrrrggggbbbb</literal>, where <literal>r</literal>,
* <literal>g</literal> and <literal>b</literal> are hex digits
* representing the red, green and blue components respectively.
*
* Return value: a newly-allocated text string
*
* Since: 2.12
**/
gchar *
gdk_color_to_string (const GdkColor *color)
{
PangoColor pango_color;
g_return_val_if_fail (color != NULL, NULL);
pango_color.red = color->red;
pango_color.green = color->green;
pango_color.blue = color->blue;
return pango_color_to_string (&pango_color);
}
/** /**
* gdk_colormap_get_system: * gdk_colormap_get_system:
* *

15
gdk/gdkcolor.h
View File

@ -127,13 +127,14 @@ void gdk_colormap_query_color (GdkColormap *colormap,
GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap); GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
GdkColor *gdk_color_copy (const GdkColor *color); GdkColor *gdk_color_copy (const GdkColor *color);
void gdk_color_free (GdkColor *color); void gdk_color_free (GdkColor *color);
gboolean gdk_color_parse (const gchar *spec, gboolean gdk_color_parse (const gchar *spec,
GdkColor *color); GdkColor *color);
guint gdk_color_hash (const GdkColor *colora); guint gdk_color_hash (const GdkColor *colora);
gboolean gdk_color_equal (const GdkColor *colora, gboolean gdk_color_equal (const GdkColor *colora,
const GdkColor *colorb); const GdkColor *colorb);
gchar * gdk_color_to_string (const GdkColor *color);
GType gdk_color_get_type (void) G_GNUC_CONST; GType gdk_color_get_type (void) G_GNUC_CONST;