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

Introjucer: in GUI editor, made sure image resources are loaded correctly.

Browse source
This commit is contained in:
jules 2013-10-15 17:30:19 +01:00
parent 40ca59a54e
commit cff361828a
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp
View file

@ -80,7 +80,7 @@ BinaryResources::BinaryResource* BinaryResources::findResource (const String& na
if (resources.getUnchecked(i)->name == name)
return resources.getUnchecked(i);
return 0;
return nullptr;
}
const BinaryResources::BinaryResource* BinaryResources::getResource (const String& name) const
@ -94,7 +94,7 @@ const BinaryResources::BinaryResource* BinaryResources::getResourceForFile (cons
if (resources.getUnchecked(i)->originalFilename == file.getFullPathName())
return resources.getUnchecked(i);
return 0;
return nullptr;
}
bool BinaryResources::add (const String& name, const File& file)

5
extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp
View file

@ -591,11 +591,10 @@ bool JucerDocument::reloadFromDocument()
currentXML = newXML;
stopTimer();
if (! loadFromXml (*currentXML))
return false;
resources.loadFromCpp (getCppFile(), cppContent);
return true;
return loadFromXml (*currentXML);
}
XmlElement* JucerDocument::pullMetaDataFromCppFile (const String& cpp)