1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 296142c5852e951b1f84cda50a426865d3515e8e..d335ae6fce6bd48a49302192a12059344ca32b55 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "font.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -48,46 +44,46 @@
 #if wxUSE_EXTENDED_RTTI
 
 wxBEGIN_ENUM( wxFontFamily )
 #if wxUSE_EXTENDED_RTTI
 
 wxBEGIN_ENUM( wxFontFamily )

-       wxENUM_MEMBER( wxDEFAULT )
-       wxENUM_MEMBER( wxDECORATIVE )
-       wxENUM_MEMBER( wxROMAN )
-       wxENUM_MEMBER( wxSCRIPT )
-       wxENUM_MEMBER( wxSWISS )
-       wxENUM_MEMBER( wxMODERN )
-       wxENUM_MEMBER( wxTELETYPE )
+    wxENUM_MEMBER( wxDEFAULT )
+    wxENUM_MEMBER( wxDECORATIVE )
+    wxENUM_MEMBER( wxROMAN )
+    wxENUM_MEMBER( wxSCRIPT )
+    wxENUM_MEMBER( wxSWISS )
+    wxENUM_MEMBER( wxMODERN )
+    wxENUM_MEMBER( wxTELETYPE )

 wxEND_ENUM( wxFontFamily )
 
 wxBEGIN_ENUM( wxFontStyle )
 wxEND_ENUM( wxFontFamily )
 
 wxBEGIN_ENUM( wxFontStyle )

-       wxENUM_MEMBER( wxNORMAL )
-       wxENUM_MEMBER( wxITALIC )
-       wxENUM_MEMBER( wxSLANT )
+    wxENUM_MEMBER( wxNORMAL )
+    wxENUM_MEMBER( wxITALIC )
+    wxENUM_MEMBER( wxSLANT )

 wxEND_ENUM( wxFontStyle )
 
 wxBEGIN_ENUM( wxFontWeight )
 wxEND_ENUM( wxFontStyle )
 
 wxBEGIN_ENUM( wxFontWeight )

-       wxENUM_MEMBER( wxNORMAL )
-       wxENUM_MEMBER( wxLIGHT )
-       wxENUM_MEMBER( wxBOLD )
+    wxENUM_MEMBER( wxNORMAL )
+    wxENUM_MEMBER( wxLIGHT )
+    wxENUM_MEMBER( wxBOLD )

 wxEND_ENUM( wxFontWeight )
 
 IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxFont)
 wxEND_ENUM( wxFontWeight )
 
 IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxFont)

-       wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-       wxPROPERTY( Family, int  , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily
-       wxPROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle
-       wxPROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight
-       wxPROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-       wxPROPERTY( Face, wxString , SetFaceName, GetFaceName, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-       wxPROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Family, int  , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily
+    wxPROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle
+    wxPROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight
+    wxPROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Face, wxString , SetFaceName, GetFaceName, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

 wxEND_PROPERTIES_TABLE()
 
 wxEND_PROPERTIES_TABLE()
 

-wxCONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face )  
+wxCONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face )

 
 wxBEGIN_HANDLERS_TABLE(wxFont)
 wxEND_HANDLERS_TABLE()
 
 #else
 
 wxBEGIN_HANDLERS_TABLE(wxFont)
 wxEND_HANDLERS_TABLE()
 
 #else

-       IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

 #endif
 
 
 #endif
 
 


@@ -108,11 +104,14 @@ public:
     // constructors
     wxFontRefData()
     {
     // constructors
     wxFontRefData()
     {

-        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
-             FALSE, wxEmptyString, wxFONTENCODING_DEFAULT);
+        Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+             wxFONTWEIGHT_NORMAL, false, wxEmptyString,
+             wxFONTENCODING_DEFAULT);

     }
 
     wxFontRefData(int size,
     }
 
     wxFontRefData(int size,

+                  const wxSize& pixelSize,
+                  bool sizeUsingPixels,

                   int family,
                   int style,
                   int weight,
                   int family,
                   int style,
                   int weight,


@@ -120,7 +119,8 @@ public:
                   const wxString& faceName,
                   wxFontEncoding encoding)
     {
                   const wxString& faceName,
                   wxFontEncoding encoding)
     {

-        Init(size, family, style, weight, underlined, faceName, encoding);
+        Init(size, pixelSize, sizeUsingPixels, family, style, weight,
+             underlined, faceName, encoding);

     }
 
     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
     }
 
     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)


@@ -128,7 +128,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 )
         {


@@ -136,7 +136,8 @@ public:
         }
         else
         {
         }
         else
         {

-            Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
+            Init(data.m_pointSize, data.m_pixelSize, data.m_sizeUsingPixels,
+                 data.m_family, data.m_style, data.m_weight,

                  data.m_underlined, data.m_faceName, data.m_encoding);
         }
     }
                  data.m_underlined, data.m_faceName, data.m_encoding);
         }
     }


@@ -155,6 +156,17 @@ public:
                                   : m_pointSize;
     }
 
                                   : m_pointSize;
     }
 

+    wxSize GetPixelSize() const
+    {
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize()
+                                  : m_pixelSize;
+    }
+
+    bool IsUsingSizeInPixels() const
+    {
+        return m_nativeFontInfoOk ? true : m_sizeUsingPixels;
+    }
+

     int GetFamily() const
     {
         return m_family;
     int GetFamily() const
     {
         return m_family;


@@ -201,9 +213,27 @@ public:
     void SetPointSize(int pointSize)
     {
         if ( m_nativeFontInfoOk )
     void SetPointSize(int pointSize)
     {
         if ( m_nativeFontInfoOk )

+        {

             m_nativeFontInfo.SetPointSize(pointSize);
             m_nativeFontInfo.SetPointSize(pointSize);

+        }

         else
         else

+        {

             m_pointSize = pointSize;
             m_pointSize = pointSize;

+            m_sizeUsingPixels = false;
+        }
+    }
+
+    void SetPixelSize(const wxSize& pixelSize)
+    {
+        if ( m_nativeFontInfoOk )
+        {
+            m_nativeFontInfo.SetPixelSize(pixelSize);
+        }
+        else
+        {
+            m_pixelSize = pixelSize;
+            m_sizeUsingPixels = true;
+        }

     }
 
     void SetFamily(int family)
     }
 
     void SetFamily(int family)


@@ -260,6 +290,8 @@ public:
 protected:
     // common part of all ctors
     void Init(int size,
 protected:
     // common part of all ctors
     void Init(int size,

+              const wxSize& pixelSize,
+              bool sizeUsingPixels,

               int family,
               int style,
               int weight,
               int family,
               int style,
               int weight,


@@ -271,6 +303,8 @@ protected:
 
     // font characterstics
     int           m_pointSize;
 
     // font characterstics
     int           m_pointSize;

+    wxSize        m_pixelSize;
+    bool          m_sizeUsingPixels;

     int           m_family;
     int           m_style;
     int           m_weight;
     int           m_family;
     int           m_style;
     int           m_weight;


@@ -295,6 +329,8 @@ protected:
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,

+                         const wxSize& pixelSize,
+                         bool sizeUsingPixels,

                          int family,
                          int style,
                          int weight,
                          int family,
                          int style,
                          int weight,


@@ -304,6 +340,8 @@ void wxFontRefData::Init(int pointSize,
 {
     m_style = style;
     m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize;
 {
     m_style = style;
     m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize;

+    m_pixelSize = pixelSize;
+    m_sizeUsingPixels = sizeUsingPixels;

     m_family = family;
     m_style = style;
     m_weight = weight;
     m_family = family;
     m_style = style;
     m_weight = weight;


@@ -313,7 +351,7 @@ void wxFontRefData::Init(int pointSize,
 
     m_hFont = 0;
 
 
     m_hFont = 0;
 

-    m_nativeFontInfoOk = FALSE;
+    m_nativeFontInfoOk = false;

 }
 
 void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
 }
 
 void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)


@@ -324,7 +362,7 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
     // to LOGFONT back to HFONT)
     m_hFont = hFont;
 
     // to LOGFONT back to HFONT)
     m_hFont = hFont;
 

-    m_nativeFontInfoOk = TRUE;
+    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_nativeFontInfo = info;
     // This is the best we can do since we don't have the
     // correct information at this point.


@@ -341,7 +379,7 @@ bool wxFontRefData::Alloc(wxFont *font)
     if ( !m_nativeFontInfoOk )
     {
         wxFillLogFont(&m_nativeFontInfo.lf, font);
     if ( !m_nativeFontInfoOk )
     {
         wxFillLogFont(&m_nativeFontInfo.lf, font);

-        m_nativeFontInfoOk = TRUE;
+        m_nativeFontInfoOk = true;

     }
 
     HFONT hfont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
     }
 
     HFONT hfont = ::CreateFontIndirect(&m_nativeFontInfo.lf);


@@ -349,12 +387,12 @@ bool wxFontRefData::Alloc(wxFont *font)
     {
         wxLogLastError(wxT("CreateFont"));
 
     {
         wxLogLastError(wxT("CreateFont"));
 

-        return FALSE;
+        return false;

     }
 
     m_hFont = (WXHFONT)hfont;
 
     }
 
     m_hFont = (WXHFONT)hfont;
 

-    return TRUE;
+    return true;

 }
 
 void wxFontRefData::Free()
 }
 
 void wxFontRefData::Free()


@@ -388,6 +426,14 @@ int wxNativeFontInfo::GetPointSize() const
     return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5);
 }
 
     return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5);
 }
 

+wxSize wxNativeFontInfo::GetPixelSize() const
+{
+    wxSize ret;
+    ret.SetHeight(lf.lfHeight);
+    ret.SetWidth(lf.lfWidth);
+    return ret;
+}
+

 wxFontStyle wxNativeFontInfo::GetStyle() const
 {
     return lf.lfItalic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL;
 wxFontStyle wxNativeFontInfo::GetStyle() const
 {
     return lf.lfItalic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL;


@@ -456,18 +502,20 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {

-#if wxFONT_SIZE_COMPATIBILITY
-    // Incorrect, but compatible with old wxWindows 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)
+{
+    lf.lfHeight = pixelSize.GetHeight();
+    lf.lfWidth = pixelSize.GetWidth();
+}
+
+

 void wxNativeFontInfo::SetStyle(wxFontStyle style)
 {
     switch ( style )
 void wxNativeFontInfo::SetStyle(wxFontStyle style)
 {
     switch ( style )


@@ -514,14 +562,14 @@ void wxNativeFontInfo::SetUnderlined(bool underlined)
     lf.lfUnderline = underlined;
 }
 
     lf.lfUnderline = underlined;
 }
 

-void wxNativeFontInfo::SetFaceName(wxString facename)
+void wxNativeFontInfo::SetFaceName(const wxString& facename)

 {
     wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {
 {
     wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {

-    int ff_family;
+    BYTE ff_family;

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


@@ -554,11 +602,19 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
 
         case wxDEFAULT:
         default:
 
         case wxDEFAULT:
         default:

+        {
+            // We want Windows 2000 or later to have new fonts even MS Shell Dlg
+            // is returned as default GUI font for compatibility
+            int verMaj;

             ff_family = FF_SWISS;
             ff_family = FF_SWISS;

-            facename = _T("MS Sans Serif");
+            if(wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
+                facename = _T("MS Shell Dlg 2");
+            else
+                facename = _T("MS Shell Dlg");
+        }

     }
 
     }
 

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

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


@@ -590,7 +646,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)


@@ -602,79 +658,79 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     // first the version
     wxString token = tokenizer.GetNextToken();
     if ( token != _T('0') )
     // first the version
     wxString token = tokenizer.GetNextToken();
     if ( token != _T('0') )

-        return FALSE;
+        return false;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfHeight = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfHeight = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfWidth = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfWidth = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfEscapement = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfEscapement = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfOrientation = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfOrientation = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfWeight = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfWeight = l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfItalic = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfItalic = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfUnderline = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfUnderline = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfStrikeOut = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfStrikeOut = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfCharSet = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfCharSet = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfOutPrecision = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfOutPrecision = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfClipPrecision = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfClipPrecision = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfQuality = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
     lf.lfQuality = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

     lf.lfPitchAndFamily = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if(!token)
     lf.lfPitchAndFamily = (BYTE)l;
 
     token = tokenizer.GetNextToken();
     if(!token)

-        return FALSE;
+        return false;

     wxStrcpy(lf.lfFaceName, token.c_str());
 
     wxStrcpy(lf.lfFaceName, token.c_str());
 

-    return TRUE;
+    return true;

 }
 
 wxString wxNativeFontInfo::ToString() const
 }
 
 wxString wxNativeFontInfo::ToString() const


@@ -717,7 +773,7 @@ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
 
     RealizeResource();
 
 
     RealizeResource();
 

-    return TRUE;
+    return true;

 }
 
 wxFont::wxFont(const wxString& fontdesc)
 }
 
 wxFont::wxFont(const wxString& fontdesc)


@@ -730,13 +786,15 @@ wxFont::wxFont(const wxString& fontdesc)
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */

-bool wxFont::Create(int pointSize,
-                    int family,
-                    int style,
-                    int weight,
-                    bool underlined,
-                    const wxString& faceName,
-                    wxFontEncoding encoding)
+bool wxFont::DoCreate(int pointSize,
+                      const wxSize& pixelSize,
+                      bool sizeUsingPixels,
+                      int family,
+                      int style,
+                      int weight,
+                      bool underlined,
+                      const wxString& faceName,
+                      wxFontEncoding encoding)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -747,12 +805,13 @@ bool wxFont::Create(int pointSize,
         pointSize = wxNORMAL_FONT->GetPointSize();
     }
 
         pointSize = wxNORMAL_FONT->GetPointSize();
     }
 

-    m_refData = new wxFontRefData(pointSize, family, style, weight,
+    m_refData = new wxFontRefData(pointSize, pixelSize, sizeUsingPixels,
+                                  family, style, weight,

                                   underlined, faceName, encoding);
 
     RealizeResource();
 
                                   underlined, faceName, encoding);
 
     RealizeResource();
 

-    return TRUE;
+    return true;

 }
 
 wxFont::~wxFont()
 }
 
 wxFont::~wxFont()


@@ -767,9 +826,9 @@ bool wxFont::RealizeResource()
 {
     if ( GetResourceHandle() )
     {
 {
     if ( GetResourceHandle() )
     {

-        // VZ: the old code returned FALSE in this case, but it doesn't seem
+        // VZ: the old code returned false in this case, but it doesn't seem

         //     to make sense because the font _was_ created
         //     to make sense because the font _was_ created

-        return TRUE;
+        return true;

     }
 
     return M_FONTDATA->Alloc(this);
     }
 
     return M_FONTDATA->Alloc(this);


@@ -781,10 +840,10 @@ bool wxFont::FreeResource(bool WXUNUSED(force))
     {
         M_FONTDATA->Free();
 
     {
         M_FONTDATA->Free();
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 WXHANDLE wxFont::GetResourceHandle() const
 }
 
 WXHANDLE wxFont::GetResourceHandle() const


@@ -830,6 +889,15 @@ void wxFont::SetPointSize(int pointSize)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

+void wxFont::SetPixelSize(const wxSize& pixelSize)
+{
+    Unshare();
+
+    M_FONTDATA->SetPixelSize(pixelSize);
+
+    RealizeResource();
+}
+

 void wxFont::SetFamily(int family)
 {
     Unshare();
 void wxFont::SetFamily(int family)
 {
     Unshare();


@@ -906,6 +974,18 @@ int wxFont::GetPointSize() const
     return M_FONTDATA->GetPointSize();
 }
 
     return M_FONTDATA->GetPointSize();
 }
 

+wxSize wxFont::GetPixelSize() const
+{
+    return M_FONTDATA->GetPixelSize();
+}
+
+bool wxFont::IsUsingSizeInPixels() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
+    return M_FONTDATA->IsUsingSizeInPixels();
+}
+

 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );


@@ -929,7 +1009,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );

 
     return M_FONTDATA->GetUnderlined();
 }
 
     return M_FONTDATA->GetUnderlined();
 }


@@ -948,12 +1028,10 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->GetEncoding();
 }
 
     return M_FONTDATA->GetEncoding();
 }
 

-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const

 {
 {

-    if ( M_FONTDATA->HasNativeFontInfo() )
-        return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo());
-
-    return 0;
+    return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
+                                           : NULL;

 }
 
 bool wxFont::IsFixedWidth() const
 }
 
 bool wxFont::IsFixedWidth() const


@@ -962,8 +1040,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;
     }