summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanmarie Diggs <joanmarie.diggs@gmail.com>2009-08-10 11:30:26 +0800
committerLi Yuan <li.yuan@sun.com>2009-08-10 11:30:26 +0800
commit8421b6099bf730d23207ad6ab03d3ddd0a22044e (patch)
tree3a737cf008b8f9a5e17fe4dc92028b392e1a6eba
parentd85e93daf0367609cb684aff091214bdd9ed8c66 (diff)
downloadatk-8421b6099bf730d23207ad6ab03d3ddd0a22044e.tar.gz
Add work_char to atktext's wrap mode.
Bug #591105.
-rwxr-xr-xatk/atktext.c5
-rwxr-xr-xatk/atktext.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/atk/atktext.c b/atk/atktext.c
index 5bb9397..59b53f0 100755
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -89,9 +89,10 @@ static const guint8 direction_offsets[] = {
static const char wrap_mode[] =
"none\0"
"char\0"
- "word";
+ "word\0"
+ "word_char";
static const guint8 wrap_mode_offsets[] = {
- 0, 5, 10
+ 0, 5, 10, 15
};
static const char underline[] =
diff --git a/atk/atktext.h b/atk/atktext.h
index 7ff3521..3ec19ce 100755
--- a/atk/atktext.h
+++ b/atk/atktext.h
@@ -54,7 +54,7 @@ G_BEGIN_DECLS
*@ATK_TEXT_ATTR_FG_COLOR:The foreground color. The value is an RGB value of the format "%u,%u,%u"
*@ATK_TEXT_ATTR_BG_STIPPLE: "true" if a #GdkBitmap is set for stippling the background color.
*@ATK_TEXT_ATTR_FG_STIPPLE: "true" if a #GdkBitmap is set for stippling the foreground color.
- *@ATK_TEXT_ATTR_WRAP_MODE: The wrap mode of the text, if any. Values are "none", "char" or "word"
+ *@ATK_TEXT_ATTR_WRAP_MODE: The wrap mode of the text, if any. Values are "none", "char", "word", or "word_char".
*@ATK_TEXT_ATTR_DIRECTION: The direction of the text, if set. Values are "none", "ltr" or "rtl"
*@ATK_TEXT_ATTR_JUSTIFICATION: The justification of the text, if set. Values are "left", "right", "center" or "fill"
*@ATK_TEXT_ATTR_STRETCH: The stretch of the text, if set. Values are "ultra_condensed", "extra_condensed", "condensed", "semi_condensed", "normal", "semi_expanded", "expanded", "extra_expanded" or "ultra_expanded"