aboutsummaryrefslogtreecommitdiff
path: root/graphics/font.h
diff options
context:
space:
mode:
authorNeeraj Kumar2010-08-06 20:13:41 +0000
committerNeeraj Kumar2010-08-06 20:13:41 +0000
commit7e126ed299cb789340cb2f8d409338dbdd6c8235 (patch)
tree91f6e4be633fd579922ddf270443011582b8f9ec /graphics/font.h
parent6c0855f3d3efc52478ba9ce019fbd4c9287f4691 (diff)
parent4ae7427eed781613e2cda096d0f61c77883bca05 (diff)
downloadscummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.gz
scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.bz2
scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.zip
TESTBED: Merged changes from trunk to my branch
svn-id: r51798
Diffstat (limited to 'graphics/font.h')
-rw-r--r--graphics/font.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/font.h b/graphics/font.h
index 6927e0e076..0e65e9418c 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -67,10 +67,10 @@ public:
int getStringWidth(const Common::String &str) const;
/**
- * Take a text (which may contain newlines characters) and word wrap it so thata
+ * Take a text (which may contain newline characters) and word wrap it so that
* no text line is wider than maxWidth pixels. If necessary, additional line breaks
- * are generated, preferably between words (i.e. were whitespaces are).
- * The resulting lines are appended to the string list lines.
+ * are generated, preferably between words (i.e. where whitespaces are).
+ * The resulting lines are appended to the lines string list.
* It returns the maximal width of any of the new lines (i.e. a value which is less
* or equal to maxWidth).
*