mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-22 01:34:21 +00:00
Code Activity

Added some wchar_t constructors to StringArray. Altered the Typeface class to let subclasses create edgetables for glyphs. Android development.

Browse source
This commit is contained in:
Julian Storer 2011-02-21 13:02:29 +00:00
parent 3f97694143
commit f471f0a72d
16 changed files with 1435 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/text/juce_StringArray.cpp
View file

@ -45,36 +45,56 @@ StringArray::StringArray (const String& firstValue)
strings.add (firstValue);
}
StringArray::StringArray (const juce_wchar* const* const initialStrings,
const int numberOfStrings)
namespace StringArrayHelpers
{
for (int i = 0; i < numberOfStrings; ++i)
strings.add (initialStrings [i]);
}
template <typename CharType>
void addArray (Array<String>& dest, const CharType* const* strings)
{
if (strings != 0)
while (*strings != 0)
dest.add (*strings++);
}
StringArray::StringArray (const char* const* const initialStrings,
const int numberOfStrings)
{
for (int i = 0; i < numberOfStrings; ++i)
strings.add (initialStrings [i]);
}
StringArray::StringArray (const juce_wchar* const* const initialStrings)
{
int i = 0;
while (initialStrings[i] != 0)
strings.add (initialStrings [i++]);
template <typename CharType>
void addArray (Array<String>& dest, const CharType* const* const strings, const int numberOfStrings)
{
for (int i = 0; i < numberOfStrings; ++i)
dest.add (strings [i]);
}
}
StringArray::StringArray (const char* const* const initialStrings)
{
int i = 0;
while (initialStrings[i] != 0)
strings.add (initialStrings [i++]);
StringArrayHelpers::addArray (strings, initialStrings);
}
StringArray::StringArray (const char* const* const initialStrings, const int numberOfStrings)
{
StringArrayHelpers::addArray (strings, initialStrings, numberOfStrings);
}
StringArray::StringArray (const juce_wchar* const* const initialStrings)
{
StringArrayHelpers::addArray (strings, initialStrings);
}
StringArray::StringArray (const juce_wchar* const* const initialStrings, const int numberOfStrings)
{
StringArrayHelpers::addArray (strings, initialStrings, numberOfStrings);
}
#if ! JUCE_NATIVE_WCHAR_IS_UTF32
StringArray::StringArray (const wchar_t* const* const initialStrings)
{
StringArrayHelpers::addArray (strings, initialStrings);
}
StringArray::StringArray (const wchar_t* const* const initialStrings, const int numberOfStrings)
{
StringArrayHelpers::addArray (strings, initialStrings, numberOfStrings);
}
#endif
StringArray& StringArray::operator= (const StringArray& other)
{
strings = other.strings;