projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A fix for attribrute sorting, but it's still broken if there are
[wxWidgets.git]
/
include
/
wx
/
msw
/
font.h
diff --git
a/include/wx/msw/font.h
b/include/wx/msw/font.h
index 12677e19d594b684b6996e0dec91edea71ad742e..8149aaa6afcdfcfafda14164304d8f3d6c64f45c 100644
(file)
--- a/
include/wx/msw/font.h
+++ b/
include/wx/msw/font.h
@@
-40,14
+40,15
@@
public:
(void)Create(size, family, style, weight, underlined, face, encoding);
}
(void)Create(size, family, style, weight, underlined, face, encoding);
}
- wxFont(const wxNativeFontInfo& info)
+ wxFont(const wxNativeFontInfo& info
, WXHFONT hFont = 0
)
{
Init();
{
Init();
- (void)Create(info.pointSize, info.family, info.style, info.weight,
- info.underlined, info.faceName, info.encoding);
+ Create(info, hFont);
}
}
+ wxFont(const wxString& fontDesc);
+
bool Create(int size,
int family,
int style,
bool Create(int size,
int family,
int style,
@@
-56,6
+57,8
@@
public:
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+ bool Create(const wxNativeFontInfo& info, WXHFONT hFont = 0);
+
virtual ~wxFont();
// assignment
virtual ~wxFont();
// assignment
@@
-69,6
+72,7
@@
public:
virtual bool GetUnderlined() const;
virtual wxString GetFaceName() const;
virtual wxFontEncoding GetEncoding() const;
virtual bool GetUnderlined() const;
virtual wxString GetFaceName() const;
virtual wxFontEncoding GetEncoding() const;
+ virtual wxNativeFontInfo* GetNativeFontInfo() const;
virtual void SetPointSize(int pointSize);
virtual void SetFamily(int family);
virtual void SetPointSize(int pointSize);
virtual void SetFamily(int family);
@@
-77,6
+81,7
@@
public:
virtual void SetFaceName(const wxString& faceName);
virtual void SetUnderlined(bool underlined);
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetFaceName(const wxString& faceName);
virtual void SetUnderlined(bool underlined);
virtual void SetEncoding(wxFontEncoding encoding);
+ virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
// implementation only from now on
// -------------------------------
// implementation only from now on
// -------------------------------