Interface updates for Phoenix. Add wxNativeFontInfo.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-09 01:28:20 +00:00
parent 7cd038613b
commit d775ec48a7
3 changed files with 117 additions and 2 deletions

View File

@@ -264,7 +264,6 @@ enum wxFontEncoding
};
/**
@class wxFont
@@ -402,7 +401,12 @@ public:
If @a fontdesc is invalid the font remains uninitialized, i.e. its IsOk() method
will return @false.
*/
wxFont(const wxString& fontdesc);
wxFont(const wxString& nativeInfoString);
/**
Construct font from a native font info structure.
*/
wxFont(const wxNativeFontInfo& nativeInfo);
/**
Destructor.
@@ -487,6 +491,8 @@ public:
*/
wxString GetNativeFontInfoUserDesc() const;
const wxNativeFontInfo *GetNativeFontInfo() const;
/**
Gets the point size.
@@ -775,6 +781,8 @@ public:
*/
bool SetNativeFontInfoUserDesc(const wxString& info);
void SetNativeFontInfo(const wxNativeFontInfo& info);
/**
Sets the point size.
@@ -923,6 +931,11 @@ public:
int flags = wxFONTFLAG_DEFAULT,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
static wxFont *New(const wxNativeFontInfo& nativeInfo);
static wxFont *New(const wxString& nativeInfoString);
//@}
};