@@ -70235,7 +70235,7 @@ public: | |||||
if (forcedUpdate || cursor.getHandle() != currentCursorHandle) | if (forcedUpdate || cursor.getHandle() != currentCursorHandle) | ||||
{ | { | ||||
currentCursorHandle = cursor.getHandle(); | currentCursorHandle = cursor.getHandle(); | ||||
cursor.showInWindow (lastPeer); | |||||
cursor.showInWindow (getPeer()); | |||||
} | } | ||||
} | } | ||||
@@ -230591,7 +230591,7 @@ public: | |||||
} | } | ||||
StringArray fontDirs; | StringArray fontDirs; | ||||
fontDirs.addTokens (String (getenv ("JUCE_FONT_PATH")), T(";,"), 0); | |||||
fontDirs.addTokens (String::fromUTF8 (getenv ("JUCE_FONT_PATH")), ";,", String::empty); | |||||
fontDirs.removeEmptyStrings (true); | fontDirs.removeEmptyStrings (true); | ||||
if (fontDirs.size() == 0) | if (fontDirs.size() == 0) | ||||
@@ -231006,7 +231006,7 @@ static const String pickBestFont (const StringArray& names, | |||||
const char* const choicesString) | const char* const choicesString) | ||||
{ | { | ||||
StringArray choices; | StringArray choices; | ||||
choices.addTokens (String (choicesString), T(","), 0); | |||||
choices.addTokens (String (choicesString), ",", String::empty); | |||||
choices.trim(); | choices.trim(); | ||||
choices.removeEmptyStrings(); | choices.removeEmptyStrings(); | ||||
@@ -236584,11 +236584,11 @@ void FileChooser::showPlatformDialog (Array<File>& results, | |||||
if (status == 0) | if (status == 0) | ||||
{ | { | ||||
String resultString (String::fromUTF8 ((const char*) result.getData(), result.getDataSize())); | |||||
String resultString (String::fromUTF8 (result.getData(), result.getDataSize())); | |||||
StringArray tokens; | StringArray tokens; | ||||
if (selectMultipleFiles) | if (selectMultipleFiles) | ||||
tokens.addTokens (resultString, separator, 0); | |||||
tokens.addTokens (resultString, separator, String::empty); | |||||
else | else | ||||
tokens.add (resultString); | tokens.add (resultString); | ||||
@@ -416,7 +416,7 @@ public: | |||||
if (forcedUpdate || cursor.getHandle() != currentCursorHandle) | if (forcedUpdate || cursor.getHandle() != currentCursorHandle) | ||||
{ | { | ||||
currentCursorHandle = cursor.getHandle(); | currentCursorHandle = cursor.getHandle(); | ||||
cursor.showInWindow (lastPeer); | |||||
cursor.showInWindow (getPeer()); | |||||
} | } | ||||
} | } | ||||
@@ -81,11 +81,11 @@ void FileChooser::showPlatformDialog (Array<File>& results, | |||||
if (status == 0) | if (status == 0) | ||||
{ | { | ||||
String resultString (String::fromUTF8 ((const char*) result.getData(), result.getDataSize())); | |||||
String resultString (String::fromUTF8 (result.getData(), result.getDataSize())); | |||||
StringArray tokens; | StringArray tokens; | ||||
if (selectMultipleFiles) | if (selectMultipleFiles) | ||||
tokens.addTokens (resultString, separator, 0); | |||||
tokens.addTokens (resultString, separator, String::empty); | |||||
else | else | ||||
tokens.add (resultString); | tokens.add (resultString); | ||||
@@ -101,7 +101,7 @@ public: | |||||
} | } | ||||
StringArray fontDirs; | StringArray fontDirs; | ||||
fontDirs.addTokens (String (getenv ("JUCE_FONT_PATH")), T(";,"), 0); | |||||
fontDirs.addTokens (String::fromUTF8 (getenv ("JUCE_FONT_PATH")), ";,", String::empty); | |||||
fontDirs.removeEmptyStrings (true); | fontDirs.removeEmptyStrings (true); | ||||
if (fontDirs.size() == 0) | if (fontDirs.size() == 0) | ||||
@@ -521,7 +521,7 @@ static const String pickBestFont (const StringArray& names, | |||||
const char* const choicesString) | const char* const choicesString) | ||||
{ | { | ||||
StringArray choices; | StringArray choices; | ||||
choices.addTokens (String (choicesString), T(","), 0); | |||||
choices.addTokens (String (choicesString), ",", String::empty); | |||||
choices.trim(); | choices.trim(); | ||||
choices.removeEmptyStrings(); | choices.removeEmptyStrings(); | ||||