Fix for GCC compilation

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index d87bdd0821ea09a08a8174d90c3c935cc1dd7522..b18902071fb5c954f1cf150c0bba17583546de66 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -132,7 +132,7 @@ public:
         Init(info, hFont);
     }
 
         Init(info, hFont);
     }
 

-    wxFontRefData(const wxFontRefData& data)
+    wxFontRefData(const wxFontRefData& data) : wxGDIRefData()

     {
         if ( data.m_nativeFontInfoOk )
         {
     {
         if ( data.m_nativeFontInfoOk )
         {


@@ -165,10 +165,10 @@ public:
         return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize()
                                   : m_pixelSize;
     }
         return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize()
                                   : m_pixelSize;
     }

-    
+

     bool IsUsingSizeInPixels() const
     {
     bool IsUsingSizeInPixels() const
     {

-        return m_nativeFontInfoOk ? TRUE : m_sizeUsingPixels;
+        return m_nativeFontInfoOk ? true : m_sizeUsingPixels;

     }
 
     int GetFamily() const
     }
 
     int GetFamily() const


@@ -506,16 +506,11 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {

-#if wxFONT_SIZE_COMPATIBILITY
-    // Incorrect, but compatible with old wxWidgets behaviour
-    lf.lfHeight = (pointSize*ppInch)/72;
-#else // wxFONT_SIZE_COMPATIBILITY

     // FIXME: using the screen here results in incorrect font size calculation
     //        for printing!
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
     // FIXME: using the screen here results in incorrect font size calculation
     //        for printing!
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);

-#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY

 }
 
 void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
 }
 
 void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)


@@ -578,7 +573,7 @@ void wxNativeFontInfo::SetFaceName(wxString facename)
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {

-    int ff_family;
+    BYTE ff_family;

     wxString facename;
 
     switch ( family )
     wxString facename;
 
     switch ( family )


@@ -615,7 +610,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
             facename = _T("MS Sans Serif");
     }
 
             facename = _T("MS Sans Serif");
     }
 

-    lf.lfPitchAndFamily = DEFAULT_PITCH | ff_family;
+    lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family;

 
     if ( !wxStrlen(lf.lfFaceName) )
     {
 
     if ( !wxStrlen(lf.lfFaceName) )
     {


@@ -647,7 +642,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
         }
     }
 
         }
     }
 

-    lf.lfCharSet = info.charset;
+    lf.lfCharSet = (BYTE)info.charset;

 }
 
 bool wxNativeFontInfo::FromString(const wxString& s)
 }
 
 bool wxNativeFontInfo::FromString(const wxString& s)


@@ -1041,8 +1036,8 @@ bool wxFont::IsFixedWidth() const
     {
         // the two low-order bits specify the pitch of the font, the rest is
         // family
     {
         // the two low-order bits specify the pitch of the font, the rest is
         // family

-        BYTE pitch = M_FONTDATA->GetNativeFontInfo().
-                        lf.lfPitchAndFamily & PITCH_MASK;
+        BYTE pitch =
+            (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);

 
         return pitch == FIXED_PITCH;
     }
 
         return pitch == FIXED_PITCH;
     }