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 the constness from the return type of LookAndFeel::getTypefaceForFont(), to allow the move operator to be used.

Browse source
This commit is contained in:
jules 2013-08-02 14:15:14 +01:00
parent 41f257053a
commit 44b4ccc693
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
View file

@ -264,7 +264,7 @@ void LookAndFeel::setDefaultLookAndFeel (LookAndFeel* newDefaultLookAndFeel) noe
}
//==============================================================================
const Typeface::Ptr LookAndFeel::getTypefaceForFont (const Font& font)
Typeface::Ptr LookAndFeel::getTypefaceForFont (const Font& font)
{
if (defaultSans.isNotEmpty() && font.getTypefaceName() == Font::getDefaultSansSerifFontName())
{

2
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
View file

@ -128,7 +128,7 @@ public:
//==============================================================================
virtual const Typeface::Ptr getTypefaceForFont (const Font& font);
virtual Typeface::Ptr getTypefaceForFont (const Font& font);
/** Allows you to change the default sans-serif font.

13
modules/juce_gui_basics/native/juce_win32_Windowing.cpp
View file

@ -1404,15 +1404,14 @@ private:
static BOOL CALLBACK clipChildWindowCallback (HWND hwnd, LPARAM context)
{
RECT childPos;
GetWindowRect (hwnd, &childPos);
POINT pos = { childPos.left, childPos.top };
RECT r;
GetWindowRect (hwnd, &r);
POINT pos = { r.left, r.top };
ScreenToClient (GetParent (hwnd), &pos);
((RectangleList<int>*) context)->subtract (Rectangle<int> (pos.x,
pos.y,
childPos.right - childPos.left,
childPos.bottom - childPos.top));
((RectangleList<int>*) context)->subtract (Rectangle<int> (pos.x, pos.y,
r.right - r.left,
r.bottom - r.top));
return TRUE;
}