[gtk+] Remove gdk_char_* deprecated functions
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Remove gdk_char_* deprecated functions
- Date: Sat, 19 Jun 2010 22:23:08 +0000 (UTC)
commit 0de09140212eda79bfcf79f375b36e95e1efbfa1
Author: Javier Jardón <jjardon gnome org>
Date: Sat Jun 19 23:08:35 2010 +0200
Remove gdk_char_* deprecated functions
Remove gdk_char_width(), gdk_char_width_wc(), gdk_char_measure()
and gdk_char_height()
docs/reference/gdk/gdk3-sections.txt | 4 --
docs/reference/gdk/tmpl/fonts.sgml | 36 ---------------
gdk/gdk.symbols | 4 --
gdk/gdkfont.c | 83 ----------------------------------
gdk/gdkfont.h | 8 ---
5 files changed, 0 insertions(+), 135 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index c4ad2d5..607e4d7 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -418,14 +418,10 @@ gdk_text_extents_wc
gdk_string_width
gdk_text_width
gdk_text_width_wc
-gdk_char_width
-gdk_char_width_wc
gdk_string_measure
gdk_text_measure
-gdk_char_measure
gdk_string_height
gdk_text_height
-gdk_char_height
<SUBSECTION>
GdkWChar
diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml
index 1f68fb7..cdae72e 100644
--- a/docs/reference/gdk/tmpl/fonts.sgml
+++ b/docs/reference/gdk/tmpl/fonts.sgml
@@ -457,24 +457,6 @@ are currently:
@Returns:
-<!-- ##### FUNCTION gdk_char_width ##### -->
-<para>
-</para>
-
- font:
- character:
- Returns:
-
-
-<!-- ##### FUNCTION gdk_char_width_wc ##### -->
-<para>
-</para>
-
- font:
- character:
- Returns:
-
-
<!-- ##### FUNCTION gdk_string_measure ##### -->
<para>
</para>
@@ -494,15 +476,6 @@ are currently:
@Returns:
-<!-- ##### FUNCTION gdk_char_measure ##### -->
-<para>
-</para>
-
- font:
- character:
- Returns:
-
-
<!-- ##### FUNCTION gdk_string_height ##### -->
<para>
</para>
@@ -522,15 +495,6 @@ are currently:
@Returns:
-<!-- ##### FUNCTION gdk_char_height ##### -->
-<para>
-</para>
-
- font:
- character:
- Returns:
-
-
<!-- ##### TYPEDEF GdkWChar ##### -->
<para>
Specifies a wide character type, used to represent character codes.
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index e205ab9..1150d52 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -321,14 +321,10 @@ gdk_font_unref
#ifndef GDK_DISABLE_DEPRECATED
gdk_font_load
gdk_string_width
-gdk_char_width
-gdk_char_width_wc
gdk_string_measure
gdk_text_measure
-gdk_char_measure
gdk_string_height
gdk_text_height
-gdk_char_height
gdk_string_extents
#endif
#endif
diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c
index 8d98a00..c46fdbd 100644
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -108,45 +108,6 @@ gdk_string_width (GdkFont *font,
}
/**
- * 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:
* @font: a #GdkFont
* @string: the nul-terminated string to measure.
@@ -227,27 +188,6 @@ gdk_text_measure (GdkFont *font,
}
/**
- * 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:
* @font: a #GdkFont
* @string: the nul-terminated string to measure.
@@ -297,29 +237,6 @@ gdk_text_height (GdkFont *font,
}
/**
- * 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:
* @font_desc: a #PangoFontDescription.
*
diff --git a/gdk/gdkfont.h b/gdk/gdkfont.h
index a48a5c4..c2ed1db 100644
--- a/gdk/gdkfont.h
+++ b/gdk/gdkfont.h
@@ -84,24 +84,16 @@ gint gdk_text_width (GdkFont *font,
gint gdk_text_width_wc (GdkFont *font,
const GdkWChar *text,
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,
const gchar *string);
gint gdk_text_measure (GdkFont *font,
const gchar *text,
gint text_length);
-gint gdk_char_measure (GdkFont *font,
- gchar character);
gint gdk_string_height (GdkFont *font,
const gchar *string);
gint gdk_text_height (GdkFont *font,
const gchar *text,
gint text_length);
-gint gdk_char_height (GdkFont *font,
- gchar character);
void gdk_text_extents (GdkFont *font,
const gchar *text,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]