Browse Source

Linux build fixes.

tags/2021-05-28
Julian Storer 15 years ago
parent
commit
34201bf815
4 changed files with 10 additions and 10 deletions
  1. +5
    -5
      juce_amalgamated.cpp
  2. +1
    -1
      src/gui/components/mouse/juce_MouseInputSource.cpp
  3. +2
    -2
      src/native/linux/juce_linux_FileChooser.cpp
  4. +2
    -2
      src/native/linux/juce_linux_Fonts.cpp

+ 5
- 5
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);



+ 1
- 1
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());
}
}


+ 2
- 2
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);


+ 2
- 2
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();


Loading…
Cancel
Save