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

Extending wxFont API & OSX Core Text Implementation (#877)

Browse Source 
* 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:
Stefan Csomor
2018-09-01 19:42:18 +02:00
committed by GitHub
parent d2c77146db
commit 4580cdb9ad
22 changed files with 1210 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/xrc/xmlres.cpp
View File

@@ -2306,10 +2306,24 @@ wxFont wxXmlResourceHandlerImpl::GetFont(const wxString& param, wxWindow* parent
if (hasWeight)
{
wxString weight = GetParamValue(wxT("weight"));
if (weight == wxT("bold"))
iweight = wxFONTWEIGHT_BOLD;
if (weight == wxT("thin"))
iweight = wxFONTWEIGHT_THIN;
else if (weight == wxT("extralight"))
iweight = wxFONTWEIGHT_EXTRALIGHT;
else if (weight == wxT("light"))
iweight = wxFONTWEIGHT_LIGHT;
else if (weight == wxT("medium"))
iweight = wxFONTWEIGHT_MEDIUM;
else if (weight == wxT("semibold"))
iweight = wxFONTWEIGHT_SEMIBOLD;
else if (weight == wxT("bold"))
iweight = wxFONTWEIGHT_BOLD;
else if (weight == wxT("extrabold"))
iweight = wxFONTWEIGHT_EXTRABOLD;
else if (weight == wxT("heavy"))
iweight = wxFONTWEIGHT_HEAVY;
else if (weight == wxT("extraheavy"))
iweight = wxFONTWEIGHT_EXTRAHEAVY;
else if (weight != wxT("normal"))
{
ReportParamError