Extending wxFont API & OSX Core Text Implementation (#877)
* Switch to pure Core Text Implementation, Start extended Font API * mac fixes * First msw implementation * Fixing paste error * fixing typo * Rearranging lines to former fallthrough order * Blind fixes for covering new abstract methods * Blind gtk implementations * Fixing according to travis .. * Removing method defined in base * formatting adaptions * Extending the schema definition for new weights * fixing typo, using wxRound, other fixes according to comments * changes according to suggestions * fixing init order, before the init of m_info was overridden by Init() * redo * redo * redo * Cleanup Removing obsolete code snippets, proper traces for font names * Moving common code Only the Get/SetNumericWeight calls should now be implemented in the native part, the ‚old‘ Get/SetWeight are common code and use the numeric counterparts. * Updating docs * commit wa missing changes.txt * Doc fixes * Full stops added
This commit is contained in:
@@ -576,27 +576,7 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
|
||||
else
|
||||
s += wxS("style=\" ");
|
||||
|
||||
wxString fontweight;
|
||||
switch (m_font.GetWeight())
|
||||
{
|
||||
case wxFONTWEIGHT_MAX:
|
||||
wxFAIL_MSG(wxS("invalid font weight value"));
|
||||
wxFALLTHROUGH;
|
||||
|
||||
case wxFONTWEIGHT_NORMAL:
|
||||
fontweight = wxS("normal");
|
||||
break;
|
||||
|
||||
case wxFONTWEIGHT_LIGHT:
|
||||
fontweight = wxS("lighter");
|
||||
break;
|
||||
|
||||
case wxFONTWEIGHT_BOLD:
|
||||
fontweight = wxS("bold");
|
||||
break;
|
||||
}
|
||||
|
||||
wxASSERT_MSG(!fontweight.empty(), wxS("unknown font weight value"));
|
||||
wxString fontweight = wxString::Format(wxS("%d"),m_font.GetWeight());
|
||||
|
||||
s += wxS("font-weight:") + fontweight + wxS("; ");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user