Applied patch [ 652491 ] Update makefiles for mingw

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 16993de87863b1204a6446b825911d04b69749ae..dc601f5af85218116222cb28a35a474234982742 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:


@@ -523,7 +527,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
 #if wxUSE_FONTMAP
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
 #if wxUSE_FONTMAP

-        if ( wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )

         {
             if ( !info.facename.empty() )
             {
         {
             if ( !info.facename.empty() )
             {


@@ -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;%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,
              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