projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added some notes on the Nano-X port.
[wxWidgets.git]
/
include
/
wx
/
msw
/
font.h
diff --git
a/include/wx/msw/font.h
b/include/wx/msw/font.h
index 90073aa564f0474fd0feadfdef9d256645dcda50..06c17b10b12d366f4bb6b64e22f7ce81fad36a64 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();
@@
-83,10
+83,11
@@
public:
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNativeFontInfo(const wxNativeFontInfo& info);
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 WXHANDLE GetResourceHandle();
virtual bool IsFree() const;
virtual bool RealizeResource();
virtual WXHANDLE GetResourceHandle();