X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4244c20bf5347a453568adca86876a210bb68256..05159a2750ed2cc5945a85bc5fc6849ad1a30e75:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index c1d032c476..dc601f5af8 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -432,6 +432,7 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style) // fall through case wxFONTSTYLE_NORMAL: + lf.lfItalic = FALSE; break; case wxFONTSTYLE_ITALIC: @@ -741,9 +742,9 @@ bool wxFont::FreeResource(bool WXUNUSED(force)) return FALSE; } -WXHANDLE wxFont::GetResourceHandle() +WXHANDLE wxFont::GetResourceHandle() const { - return GetHFONT(); + return (WXHANDLE)GetHFONT(); } WXHFONT wxFont::GetHFONT() const