projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Can now skip default manifest inclusion by defining wxUSE_NO_MANIFEST
[wxWidgets.git]
/
include
/
wx
/
msw
/
font.h
diff --git
a/include/wx/msw/font.h
b/include/wx/msw/font.h
index 90073aa564f0474fd0feadfdef9d256645dcda50..b1d31e2fb1406572fc81dd3d646171c7136565fe 100644
(file)
--- a/
include/wx/msw/font.h
+++ b/
include/wx/msw/font.h
@@
-40,11
+40,11
@@
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();
- Create(info);
+ Create(info
, hFont
);
}
wxFont(const wxString& fontDesc);
}
wxFont(const wxString& fontDesc);
@@
-57,7
+57,7
@@
public:
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
- bool Create(const wxNativeFontInfo& info);
+ bool Create(const wxNativeFontInfo& info
, WXHFONT hFont = 0
);
virtual ~wxFont();
virtual ~wxFont();
@@
-81,19
+81,18
@@
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);
+
+ virtual bool IsFixedWidth() const;
// implementation only from now on
// -------------------------------
// implementation only from now on
// -------------------------------
- int GetFontId() const;
virtual bool IsFree() const;
virtual bool RealizeResource();
virtual bool IsFree() const;
virtual bool RealizeResource();
- virtual WXHANDLE GetResourceHandle();
+ virtual WXHANDLE GetResourceHandle()
const
;
virtual bool FreeResource(bool force = FALSE);
virtual bool FreeResource(bool force = FALSE);
- // for consistency with other wxMSW classes and to have a const
- // GetResourceHandle()-like function we have a synonym for it
+ // for consistency with other wxMSW classes
WXHFONT GetHFONT() const;
/*
WXHFONT GetHFONT() const;
/*
@@
-102,6
+101,8
@@
public:
*/
protected:
*/
protected:
+ virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+
// common part of all ctors
void Init();
// common part of all ctors
void Init();