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

Removed some win32 warnings, made CustomTypeface automatically update its ascent.

Browse source
This commit is contained in:
Julian Storer 2010-04-15 13:58:17 +01:00
parent d083d4f22f
commit 258b3eff81
4 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
juce_amalgamated.cpp
View file

@ -86511,6 +86511,8 @@ bool CustomTypeface::loadGlyphIfPossible (const juce_wchar /*characterNeeded*/)
void CustomTypeface::addGlyphsFromOtherTypeface (Typeface& typefaceToCopy, juce_wchar characterStartIndex, int numCharacters) throw()
{
setCharacteristics (name, typefaceToCopy.getAscent(), isBold, isItalic, defaultCharacter);
for (int i = 0; i < numCharacters; ++i)
{
const juce_wchar c = (juce_wchar) (characterStartIndex + i);

2
juce_amalgamated.h
View file

@ -3485,9 +3485,11 @@ private:
// (Required as an alternative to the overloaded & operator).
const ScopedPointer* getAddress() const throw() { return this; }
#if ! JUCE_MSVC // (MSVC can't deal with multiple copy constructors)
// This is private to stop people accidentally copying a const ScopedPointer (the compiler
// will let you do so by implicitly casting the source to its raw object pointer).
ScopedPointer (const ScopedPointer&);
#endif
};
template <class ObjectType>

2
src/containers/juce_ScopedPointer.h
View file

@ -167,9 +167,11 @@ private:
// (Required as an alternative to the overloaded & operator).
const ScopedPointer* getAddress() const throw() { return this; }
#if ! JUCE_MSVC // (MSVC can't deal with multiple copy constructors)
// This is private to stop people accidentally copying a const ScopedPointer (the compiler
// will let you do so by implicitly casting the source to its raw object pointer).
ScopedPointer (const ScopedPointer&);
#endif
};
//==============================================================================

2
src/gui/graphics/fonts/juce_Typeface.cpp
View file

@ -238,6 +238,8 @@ bool CustomTypeface::loadGlyphIfPossible (const juce_wchar /*characterNeeded*/)
void CustomTypeface::addGlyphsFromOtherTypeface (Typeface& typefaceToCopy, juce_wchar characterStartIndex, int numCharacters) throw()
{
setCharacteristics (name, typefaceToCopy.getAscent(), isBold, isItalic, defaultCharacter);
for (int i = 0; i < numCharacters; ++i)
{
const juce_wchar c = (juce_wchar) (characterStartIndex + i);