mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-02 03:20:06 +00:00
Code Activity

Linux build fixes.

Browse source
This commit is contained in:
Julian Storer 2010-03-15 15:03:31 +00:00
parent 188299adb9
commit 34201bf815
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
juce_amalgamated.cpp
View file

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

2
src/gui/components/mouse/juce_MouseInputSource.cpp
View file

@ -416,7 +416,7 @@ public:
if (forcedUpdate || cursor.getHandle() != currentCursorHandle)
{
currentCursorHandle = cursor.getHandle();
cursor.showInWindow (lastPeer);
cursor.showInWindow (getPeer());
}
}

4
src/native/linux/juce_linux_FileChooser.cpp
View file

@ -81,11 +81,11 @@ void FileChooser::showPlatformDialog (Array<File>& results,
if (status == 0)
{
String resultString (String::fromUTF8 ((const char*) result.getData(), result.getDataSize()));
String resultString (String::fromUTF8 (result.getData(), result.getDataSize()));
StringArray tokens;
if (selectMultipleFiles)
tokens.addTokens (resultString, separator, 0);
tokens.addTokens (resultString, separator, String::empty);
else
tokens.add (resultString);

4
src/native/linux/juce_linux_Fonts.cpp
View file

@ -101,7 +101,7 @@ public:
}
StringArray fontDirs;
fontDirs.addTokens (String (getenv ("JUCE_FONT_PATH")), T(";,"), 0);
fontDirs.addTokens (String::fromUTF8 (getenv ("JUCE_FONT_PATH")), ";,", String::empty);
fontDirs.removeEmptyStrings (true);
if (fontDirs.size() == 0)
@ -521,7 +521,7 @@ static const String pickBestFont (const StringArray& names,
const char* const choicesString)
{
StringArray choices;
choices.addTokens (String (choicesString), T(","), 0);
choices.addTokens (String (choicesString), ",", String::empty);
choices.trim();
choices.removeEmptyStrings();