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

Browse source
This commit is contained in:
jules 2007-06-29 09:54:03 +00:00
parent d05c83f71d
commit dab2b3cc43
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/juce_appframework/application/juce_ApplicationProperties.cpp
View file

@ -77,8 +77,7 @@ bool ApplicationProperties::testWriteAccess (const bool testUserSettings,
{
const bool userOk = (! testUserSettings) || getUserSettings()->save();
const bool commonOk = (! testCommonSettings)
|| ((userProps == getCommonSettings()) ? false
: getCommonSettings()->save());
|| (userProps != getCommonSettings() && getCommonSettings()->save());
if (! (userOk && commonOk))
{
@ -90,7 +89,17 @@ bool ApplicationProperties::testWriteAccess (const bool testUserSettings,
filenames << "\n" << getUserSettings()->getFile().getFullPathName();
if (! commonOk)
filenames << "\n" << getCommonSettings()->getFile().getFullPathName();
{
PropertiesFile* const realCommonProps
= PropertiesFile::createDefaultAppPropertiesFile (appName, fileSuffix, folderName,
true, msBeforeSaving, options);
if (realCommonProps != 0)
{
filenames << "\n" << realCommonProps->getFile().getFullPathName();
delete realCommonProps;
}
}
AlertWindow::showMessageBox (AlertWindow::WarningIcon,
appName + TRANS(" - Unable to save settings"),

4
src/juce_appframework/gui/components/mouse/juce_MouseCursor.cpp
View file

@ -185,7 +185,7 @@ void* MouseCursor::getHandle() const throw()
void MouseCursor::showWaitCursor() throw()
{
MouseCursor mc (MouseCursor::WaitCursor);
const MouseCursor mc (MouseCursor::WaitCursor);
mc.showInAllWindows();
}
@ -197,7 +197,7 @@ void MouseCursor::hideWaitCursor() throw()
}
else
{
MouseCursor mc (MouseCursor::NormalCursor);
const MouseCursor mc (MouseCursor::NormalCursor);
mc.showInAllWindows();
}
}