X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93692400d0a9f89cf013e1e101701eae0a541a59..0ddf7c0cad6ab8c394d5e1002660a3dc983735a7:/src/msw/font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 918e7c06d2..f29b9a4aea 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:
@@ -635,7 +636,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     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;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
              0, // version, in case we want to change the format later
              lf.lfHeight,
              lf.lfWidth,
@@ -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
@@ -838,7 +839,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     RealizeResource();
 }
 
-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 {
     Unshare();