thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Move typedef StringList from str.h to new header str-array.h

Browse source 
This removes the dependency on array.h from str.h.
Also, begun migration from the confusing type name "StringList" to
the more appropriate StringArray.

svn-id: r48282
This commit is contained in:
Max Horn 2010-03-18 15:09:24 +00:00
parent 30c84d2cff
commit c934642bdb
46 changed files with 139 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/message.cpp
View file

@ -53,7 +53,7 @@ MessageDialog::MessageDialog(const Common::String &message, const char *defaultB
// down the string into lines, and taking the maximum of their widths.
// Using this, and accounting for the space the button(s) need, we can set
// the real size of the dialog
Common::StringList lines;
Common::Array<Common::String> lines;
int lineCount, okButtonPos, cancelButtonPos;
int maxlineWidth = g_gui.getFont().wordWrapText(message, screenW - 2 * 20, lines);