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

Minor string clean-ups. Made key-shortcut indicators in popup menus use icons for shift/command/option on the mac.

Browse source
This commit is contained in:
Julian Storer 2011-02-24 14:27:59 +00:00
parent 04351861ae
commit 06d436a3ab
34 changed files with 99 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/native/linux/juce_linux_Files.cpp
View file

@ -150,7 +150,7 @@ const File File::getSpecialLocation (const SpecialLocationType type)
homeDir = pw->pw_dir;
}
return File (String::fromUTF8 (homeDir));
return File (CharPointer_UTF8 (homeDir));
}
case userDocumentsDirectory:
@ -185,7 +185,7 @@ const File File::getSpecialLocation (const SpecialLocationType type)
case invokedExecutableFile:
if (juce_Argv0 != 0)
return File (String::fromUTF8 (juce_Argv0));
return File (CharPointer_UTF8 (juce_Argv0));
// deliberate fall-through...
case currentExecutableFile:
@ -260,7 +260,7 @@ public:
if (fnmatch (wildcardUTF8, de->d_name, FNM_CASEFOLD) == 0)
{
filenameFound = String::fromUTF8 (de->d_name);
filenameFound = CharPointer_UTF8 (de->d_name);
updateStatInfoForFile (parentDir + filenameFound, isDir, fileSize, modTime, creationTime, isReadOnly);

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

@ -103,7 +103,7 @@ public:
}
StringArray fontDirs;
fontDirs.addTokens (String::fromUTF8 (getenv ("JUCE_FONT_PATH")), ";,", String::empty);
fontDirs.addTokens (CharPointer_UTF8 (getenv ("JUCE_FONT_PATH")), ";,", String::empty);
fontDirs.removeEmptyStrings (true);
if (fontDirs.size() == 0)

2
src/native/linux/juce_linux_Network.cpp
View file

@ -329,7 +329,7 @@ private:
numConsecutiveLFs = 0;
}
const String header (String::fromUTF8 ((const char*) buffer.getData()));
const String header (CharPointer_UTF8 ((const char*) buffer.getData()));
if (header.startsWithIgnoreCase ("HTTP/"))
return header.trimEnd();

2
src/native/linux/juce_linux_SystemStats.cpp
View file

@ -108,7 +108,7 @@ const String SystemStats::getLogonName()
user = pw->pw_name;
}
return String::fromUTF8 (user);
return CharPointer_UTF8 (user);
}
const String SystemStats::getFullUserName()

5
src/native/linux/juce_linux_Windowing.cpp
View file

@ -507,12 +507,9 @@ public:
if (! usingXShm)
#endif
{
imageDataAllocated.malloc (lineStride * h);
imageDataAllocated.allocate (lineStride * h, format_ == Image::ARGB && clearImage);
imageData = imageDataAllocated;
if (format_ == Image::ARGB && clearImage)
zeromem (imageData, h * lineStride);
xImage = (XImage*) juce_calloc (sizeof (XImage));
xImage->width = w;