Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move GetWeightClosestToNumericValue() to wxFontInfo too

Browse Source 
This is similar to a recent commit which moved float to int point size
conversions to wxFontInfo and is done for the same reasons: wxFont and
wxNativeFontInfo can depend on wxFontInfo, but the converse is not true.

No real changes.
This commit is contained in:
Vadim Zeitlin
2018-09-12 14:46:00 +02:00
parent 0a23e8dfbe
commit ff5766a8fb
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/fontcmn.cpp
View File

@@ -258,26 +258,6 @@ int wxFontBase::GetNumericWeightOf(wxFontWeight weight)
return weight;
}
// As its name indicates, this function returns the closest wxFontWeight enum
// element, even if its value doesn't correspond to the given weight exactly.
/* static */
wxFontWeight wxFontBase::GetWeightClosestToNumericValue(int numWeight)
{
wxASSERT(numWeight > 0);
wxASSERT(numWeight <= 1000);
// round to nearest hundredth = wxFONTWEIGHT_ constant
int weight = ((numWeight + 50) / 100) * 100;
if (weight < wxFONTWEIGHT_THIN)
weight = wxFONTWEIGHT_THIN;
if (weight > wxFONTWEIGHT_MAX)
weight = wxFONTWEIGHT_MAX;
return static_cast<wxFontWeight>(weight);
}
int wxFontBase::GetPointSize() const
{
return wxFontInfo::ToIntPointSize(GetFractionalPointSize());
@@ -295,7 +275,7 @@ wxFontWeight wxFontBase::GetWeight() const
{
wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, "invalid font" );
return GetWeightClosestToNumericValue(GetNumericWeight());
return wxFontInfo::GetWeightClosestToNumericValue(GetNumericWeight());
}
bool wxFontBase::IsUsingSizeInPixels() const
@@ -1324,7 +1304,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
wxFontWeight wxNativeFontInfo::GetWeight() const
{
return wxFontBase::GetWeightClosestToNumericValue(GetNumericWeight());
return wxFontInfo::GetWeightClosestToNumericValue(GetNumericWeight());
}
void wxNativeFontInfo::SetWeight(wxFontWeight weight)

2
src/unix/fontutil.cpp
View File

@@ -826,7 +826,7 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style)
void wxNativeFontInfo::SetNumericWeight(int weight)
{
wxString s;
switch ( wxFont::GetWeightClosestToNumericValue(weight) )
switch ( wxFontInfo::GetWeightClosestToNumericValue(weight) )
{
case wxFONTWEIGHT_THIN:
s = "thin";