Remove gdk_char_* deprecated functions
Remove gdk_char_width(), gdk_char_width_wc(), gdk_char_measure() and gdk_char_height()
This commit is contained in:
@ -418,14 +418,10 @@ gdk_text_extents_wc
|
|||||||
gdk_string_width
|
gdk_string_width
|
||||||
gdk_text_width
|
gdk_text_width
|
||||||
gdk_text_width_wc
|
gdk_text_width_wc
|
||||||
gdk_char_width
|
|
||||||
gdk_char_width_wc
|
|
||||||
gdk_string_measure
|
gdk_string_measure
|
||||||
gdk_text_measure
|
gdk_text_measure
|
||||||
gdk_char_measure
|
|
||||||
gdk_string_height
|
gdk_string_height
|
||||||
gdk_text_height
|
gdk_text_height
|
||||||
gdk_char_height
|
|
||||||
|
|
||||||
<SUBSECTION>
|
<SUBSECTION>
|
||||||
GdkWChar
|
GdkWChar
|
||||||
|
@ -457,24 +457,6 @@ are currently:
|
|||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_char_width ##### -->
|
|
||||||
<para>
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@font:
|
|
||||||
@character:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_char_width_wc ##### -->
|
|
||||||
<para>
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@font:
|
|
||||||
@character:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_string_measure ##### -->
|
<!-- ##### FUNCTION gdk_string_measure ##### -->
|
||||||
<para>
|
<para>
|
||||||
</para>
|
</para>
|
||||||
@ -494,15 +476,6 @@ are currently:
|
|||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_char_measure ##### -->
|
|
||||||
<para>
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@font:
|
|
||||||
@character:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_string_height ##### -->
|
<!-- ##### FUNCTION gdk_string_height ##### -->
|
||||||
<para>
|
<para>
|
||||||
</para>
|
</para>
|
||||||
@ -522,15 +495,6 @@ are currently:
|
|||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_char_height ##### -->
|
|
||||||
<para>
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@font:
|
|
||||||
@character:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### TYPEDEF GdkWChar ##### -->
|
<!-- ##### TYPEDEF GdkWChar ##### -->
|
||||||
<para>
|
<para>
|
||||||
Specifies a wide character type, used to represent character codes.
|
Specifies a wide character type, used to represent character codes.
|
||||||
|
@ -321,14 +321,10 @@ gdk_font_unref
|
|||||||
#ifndef GDK_DISABLE_DEPRECATED
|
#ifndef GDK_DISABLE_DEPRECATED
|
||||||
gdk_font_load
|
gdk_font_load
|
||||||
gdk_string_width
|
gdk_string_width
|
||||||
gdk_char_width
|
|
||||||
gdk_char_width_wc
|
|
||||||
gdk_string_measure
|
gdk_string_measure
|
||||||
gdk_text_measure
|
gdk_text_measure
|
||||||
gdk_char_measure
|
|
||||||
gdk_string_height
|
gdk_string_height
|
||||||
gdk_text_height
|
gdk_text_height
|
||||||
gdk_char_height
|
|
||||||
gdk_string_extents
|
gdk_string_extents
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -107,45 +107,6 @@ gdk_string_width (GdkFont *font,
|
|||||||
return gdk_text_width (font, string, _gdk_font_strlen (font, string));
|
return gdk_text_width (font, string, _gdk_font_strlen (font, string));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gdk_char_width:
|
|
||||||
* @font: a #GdkFont
|
|
||||||
* @character: the character to measure.
|
|
||||||
*
|
|
||||||
* Determines the width of a given character.
|
|
||||||
*
|
|
||||||
* Return value: the width of the character in pixels.
|
|
||||||
*
|
|
||||||
* Deprecated: 2.2: Use gdk_text_extents() instead.
|
|
||||||
**/
|
|
||||||
gint
|
|
||||||
gdk_char_width (GdkFont *font,
|
|
||||||
gchar character)
|
|
||||||
{
|
|
||||||
g_return_val_if_fail (font != NULL, -1);
|
|
||||||
|
|
||||||
return gdk_text_width (font, &character, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gdk_char_width_wc:
|
|
||||||
* @font: a #GdkFont
|
|
||||||
* @character: the character to measure.
|
|
||||||
*
|
|
||||||
* Determines the width of a given wide character. (Encoded
|
|
||||||
* in the wide-character encoding of the current locale).
|
|
||||||
*
|
|
||||||
* Return value: the width of the character in pixels.
|
|
||||||
**/
|
|
||||||
gint
|
|
||||||
gdk_char_width_wc (GdkFont *font,
|
|
||||||
GdkWChar character)
|
|
||||||
{
|
|
||||||
g_return_val_if_fail (font != NULL, -1);
|
|
||||||
|
|
||||||
return gdk_text_width_wc (font, &character, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gdk_string_measure:
|
* gdk_string_measure:
|
||||||
* @font: a #GdkFont
|
* @font: a #GdkFont
|
||||||
@ -226,27 +187,6 @@ gdk_text_measure (GdkFont *font,
|
|||||||
return rbearing;
|
return rbearing;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gdk_char_measure:
|
|
||||||
* @font: a #GdkFont
|
|
||||||
* @character: the character to measure.
|
|
||||||
*
|
|
||||||
* Determines the distance from the origin to the rightmost
|
|
||||||
* portion of a character when drawn. This is not the
|
|
||||||
* correct value for determining the origin of the next
|
|
||||||
* portion when drawing text in multiple pieces.
|
|
||||||
*
|
|
||||||
* Return value: the right bearing of the character in pixels.
|
|
||||||
**/
|
|
||||||
gint
|
|
||||||
gdk_char_measure (GdkFont *font,
|
|
||||||
gchar character)
|
|
||||||
{
|
|
||||||
g_return_val_if_fail (font != NULL, -1);
|
|
||||||
|
|
||||||
return gdk_text_measure (font, &character, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gdk_string_height:
|
* gdk_string_height:
|
||||||
* @font: a #GdkFont
|
* @font: a #GdkFont
|
||||||
@ -296,29 +236,6 @@ gdk_text_height (GdkFont *font,
|
|||||||
return ascent + descent;
|
return ascent + descent;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gdk_char_height:
|
|
||||||
* @font: a #GdkFont
|
|
||||||
* @character: the character to measure.
|
|
||||||
*
|
|
||||||
* Determines the total height of a given character.
|
|
||||||
* This value is not generally useful, because you cannot
|
|
||||||
* determine how this total height will be drawn in
|
|
||||||
* relation to the baseline. See gdk_text_extents().
|
|
||||||
*
|
|
||||||
* Return value: the height of the character in pixels.
|
|
||||||
*
|
|
||||||
* Deprecated: 2.2: Use gdk_text_extents() instead.
|
|
||||||
**/
|
|
||||||
gint
|
|
||||||
gdk_char_height (GdkFont *font,
|
|
||||||
gchar character)
|
|
||||||
{
|
|
||||||
g_return_val_if_fail (font != NULL, -1);
|
|
||||||
|
|
||||||
return gdk_text_height (font, &character, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gdk_font_from_description:
|
* gdk_font_from_description:
|
||||||
* @font_desc: a #PangoFontDescription.
|
* @font_desc: a #PangoFontDescription.
|
||||||
|
@ -84,24 +84,16 @@ gint gdk_text_width (GdkFont *font,
|
|||||||
gint gdk_text_width_wc (GdkFont *font,
|
gint gdk_text_width_wc (GdkFont *font,
|
||||||
const GdkWChar *text,
|
const GdkWChar *text,
|
||||||
gint text_length);
|
gint text_length);
|
||||||
gint gdk_char_width (GdkFont *font,
|
|
||||||
gchar character);
|
|
||||||
gint gdk_char_width_wc (GdkFont *font,
|
|
||||||
GdkWChar character);
|
|
||||||
gint gdk_string_measure (GdkFont *font,
|
gint gdk_string_measure (GdkFont *font,
|
||||||
const gchar *string);
|
const gchar *string);
|
||||||
gint gdk_text_measure (GdkFont *font,
|
gint gdk_text_measure (GdkFont *font,
|
||||||
const gchar *text,
|
const gchar *text,
|
||||||
gint text_length);
|
gint text_length);
|
||||||
gint gdk_char_measure (GdkFont *font,
|
|
||||||
gchar character);
|
|
||||||
gint gdk_string_height (GdkFont *font,
|
gint gdk_string_height (GdkFont *font,
|
||||||
const gchar *string);
|
const gchar *string);
|
||||||
gint gdk_text_height (GdkFont *font,
|
gint gdk_text_height (GdkFont *font,
|
||||||
const gchar *text,
|
const gchar *text,
|
||||||
gint text_length);
|
gint text_length);
|
||||||
gint gdk_char_height (GdkFont *font,
|
|
||||||
gchar character);
|
|
||||||
|
|
||||||
void gdk_text_extents (GdkFont *font,
|
void gdk_text_extents (GdkFont *font,
|
||||||
const gchar *text,
|
const gchar *text,
|
||||||
|
Reference in New Issue
Block a user