projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pc 2 mac conversion for file operations
[wxWidgets.git]
/
src
/
msw
/
font.cpp
diff --git
a/src/msw/font.cpp
b/src/msw/font.cpp
index 25ff0295e3fcabadfc2880e5a4fefdcb6f2ca6f4..f29b9a4aeafd5c067b639d2fd72ea24befa78e89 100644
(file)
--- a/
src/msw/font.cpp
+++ b/
src/msw/font.cpp
@@
-281,6
+281,9
@@
void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
m_nativeFontInfoOk = TRUE;
m_nativeFontInfo = info;
m_nativeFontInfoOk = TRUE;
m_nativeFontInfo = info;
+ // This is the best we can do since we don't have the
+ // correct information at this point.
+ m_family = wxSWISS;
}
wxFontRefData::~wxFontRefData()
}
wxFontRefData::~wxFontRefData()
@@
-429,6
+432,7
@@
void wxNativeFontInfo::SetStyle(wxFontStyle style)
// fall through
case wxFONTSTYLE_NORMAL:
// fall through
case wxFONTSTYLE_NORMAL:
+ lf.lfItalic = FALSE;
break;
case wxFONTSTYLE_ITALIC:
break;
case wxFONTSTYLE_ITALIC:
@@
-632,7
+636,7
@@
wxString wxNativeFontInfo::ToString() const
{
wxString s;
{
wxString s;
- s.Printf(_T("%d;%
d;%d;%d;%d;%
d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+ s.Printf(_T("%d;%
ld;%ld;%ld;%ld;%l
d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
0, // version, in case we want to change the format later
lf.lfHeight,
lf.lfWidth,
0, // version, in case we want to change the format later
lf.lfHeight,
lf.lfWidth,
@@
-738,9
+742,9
@@
bool wxFont::FreeResource(bool WXUNUSED(force))
return FALSE;
}
return FALSE;
}
-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle()
const
{
{
- return GetHFONT();
+ return
(WXHANDLE)
GetHFONT();
}
WXHFONT wxFont::GetHFONT() const
}
WXHFONT wxFont::GetHFONT() const
@@
-835,7
+839,7
@@
void wxFont::SetEncoding(wxFontEncoding encoding)
RealizeResource();
}
RealizeResource();
}
-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::
Do
SetNativeFontInfo(const wxNativeFontInfo& info)
{
Unshare();
{
Unshare();