No changes, just avoid overriding GetNativeFontInfoDesc() in wxMSW wxFont.
wxFont::GetNativeFontInfoDesc() and GetNativeFontInfoUserDesc() were overridden just to ensure that the font is realized but it makes sense to do it in wxFontRefData::GetNativeFontInfo() itself as detecting the face name won't work if the font is not realized anyhow. And then we don't need these functions at all as the only thing they do is checking that the font is valid when they are called but this can be done in the base class itself as this should happen in all ports (document that this is the case). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -442,7 +442,9 @@ public:
|
||||
|
||||
/**
|
||||
Returns the platform-dependent string completely describing this font.
|
||||
Returned string is always non-empty.
|
||||
|
||||
Returned string is always non-empty unless the font is invalid (in
|
||||
which case an assert is triggered).
|
||||
|
||||
Note that the returned string is not meant to be shown or edited by the user: a
|
||||
typical use of this function is for serializing in string-form a wxFont object.
|
||||
@@ -453,7 +455,9 @@ public:
|
||||
|
||||
/**
|
||||
Returns a user-friendly string for this font object.
|
||||
Returned string is always non-empty.
|
||||
|
||||
Returned string is always non-empty unless the font is invalid (in
|
||||
which case an assert is triggered).
|
||||
|
||||
The string does not encode all wxFont infos under all platforms;
|
||||
e.g. under wxMSW the font family is not present in the returned string.
|
||||
|
Reference in New Issue
Block a user