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

Added font family to wxTextAttr

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-01-15 09:20:55 +00:00
parent bf9ea28818
commit 9c4cb61167
6 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
interface/wx/textctrl.h
View File

@@ -38,9 +38,10 @@ enum wxTextAttrFlags
wxTEXT_ATTR_FONT_ITALIC = 0x00000020,
wxTEXT_ATTR_FONT_UNDERLINE = 0x00000040,
wxTEXT_ATTR_FONT_ENCODING = 0x02000000,
wxTEXT_ATTR_FONT_FAMILY = 0x04000000,
wxTEXT_ATTR_FONT = \
( wxTEXT_ATTR_FONT_FACE | wxTEXT_ATTR_FONT_SIZE | wxTEXT_ATTR_FONT_WEIGHT | \
wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_ENCODING ),
wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_ENCODING | wxTEXT_ATTR_FONT_FAMILY ),
wxTEXT_ATTR_ALIGNMENT = 0x00000080,
wxTEXT_ATTR_LEFT_INDENT = 0x00000100,
@@ -67,7 +68,7 @@ enum wxTextAttrFlags
*/
wxTEXT_ATTR_CHARACTER = \
(wxTEXT_ATTR_FONT|wxTEXT_ATTR_FONT_ENCODING|wxTEXT_ATTR_EFFECTS| \
(wxTEXT_ATTR_FONT|wxTEXT_ATTR_EFFECTS| \
wxTEXT_ATTR_BACKGROUND_COLOUR|wxTEXT_ATTR_TEXT_COLOUR|wxTEXT_ATTR_CHARACTER_STYLE_NAME|wxTEXT_ATTR_URL),
wxTEXT_ATTR_PARAGRAPH = \
@@ -295,6 +296,11 @@ public:
*/
const wxString& GetFontFaceName() const;
/**
Returns the font family.
*/
int GetFontFamily() const;
/**
Returns the font size in points.
*/
@@ -451,6 +457,11 @@ public:
*/
bool HasFontFaceName() const;
/**
Returns @true if the attribute object specifies a font family.
*/
bool HasFontFamily() const;
/**
Returns @true if the attribute object specifies italic style.
*/
@@ -641,10 +652,15 @@ public:
void SetFontEncoding(wxFontEncoding encoding);
/**
Sets the paragraph alignment.
Sets the font face name.
*/
void SetFontFaceName(const wxString& faceName);
/**
Sets the font family.
*/
void SetFontFamily(int family);
/**
Sets the font size in points.
*/