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

Merge remote-tracking branch 'gh/master' into develop

Browse source
This commit is contained in:
jules 2014-11-11 15:08:49 +00:00
commit 03c2b95bc8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/juce_core/xml/juce_XmlDocument.h
View file

@ -41,7 +41,7 @@
@code
XmlDocument myDocument (File ("myfile.xml"));
XmlElement* mainElement = myDocument.getDocumentElement();
ScopedPointer<XmlElement> mainElement (myDocument.getDocumentElement());
if (mainElement == nullptr)
{
@ -57,7 +57,7 @@
Or you can use the static helper methods for quick parsing..
@code
XmlElement* xml = XmlDocument::parse (myXmlFile);
ScopedPointer<XmlElement> xml (XmlDocument::parse (myXmlFile));
if (xml != nullptr && xml->hasTagName ("foobar"))
{

2
modules/juce_gui_basics/buttons/juce_TextButton.h
View file

@ -102,7 +102,7 @@ public:
private:
#if JUCE_CATCH_DEPRECATED_CODE_MISUSE
// Note that this method has been removed - instead, see LookAndFeel::getTextButtonWidthToFitText()
// Note that this method has been removed - instead, see LookAndFeel::getTextButtonFont()
virtual int getFont() { return 0; }
#endif