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

CustomTypeface unicode fix. Misc nullptr additions.

Browse source
This commit is contained in:
Julian Storer 2011-04-07 16:49:14 +01:00
parent f04309f44a
commit 46c3a6bbe5
27 changed files with 219 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/gui/components/filebrowser/juce_FileChooser.cpp
View file

@ -74,12 +74,12 @@ bool FileChooser::browseForMultipleFilesOrDirectories (FilePreviewComponent* pre
bool FileChooser::browseForFileToSave (const bool warnAboutOverwritingExistingFiles)
{
return showDialog (false, true, true, warnAboutOverwritingExistingFiles, false, 0);
return showDialog (false, true, true, warnAboutOverwritingExistingFiles, false, nullptr);
}
bool FileChooser::browseForDirectory()
{
return showDialog (true, false, false, false, false, 0);
return showDialog (true, false, false, false, false, nullptr);
}
bool FileChooser::showDialog (const bool selectsDirectories,
@ -97,13 +97,13 @@ bool FileChooser::showDialog (const bool selectsDirectories,
jassert (previewComponent == nullptr || (previewComponent->getWidth() > 10
&& previewComponent->getHeight() > 10));
#if JUCE_WINDOWS
#if JUCE_WINDOWS
if (useNativeDialogBox && ! (selectsFiles && selectsDirectories))
#elif JUCE_MAC
#elif JUCE_MAC
if (useNativeDialogBox && (previewComponent == nullptr))
#else
#else
if (false)
#endif
#endif
{
showPlatformDialog (results, title, startingFile, filters,
selectsDirectories, selectsFiles, isSave,