build fix

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index e4abc8de91e245c0e2f11010037875d690ab8c3d..4ed240007ce5cbb5e45fa9581e478c58cb9d1b74 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.cpp
+// Name:        src/os2/font.cpp

 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:


@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -17,26 +20,26 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

- #include <malloc.h>
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
+#include "wx/font.h"

 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>

-    #include "wx/setup.h"

     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/font.h"
+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"

+#include "wx/encinfo.h"

 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 

+#include <malloc.h>
+

 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 // ----------------------------------------------------------------------------
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 // ----------------------------------------------------------------------------


@@ -48,8 +51,8 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData()
     {
 public:
     wxFontRefData()
     {

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

     }
 
     wxFontRefData( int             nSize
     }
 
     wxFontRefData( int             nSize


@@ -108,8 +111,13 @@ public:
     //
     inline int GetPointSize(void) const
     {
     //
     inline int GetPointSize(void) const
     {

-        return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetPointSize()
-                                   : m_nPointSize;
+        //
+        // We don't use the actual native font point size since it is
+        // the chosen physical font, which is usually only and approximation
+        // of the desired outline font.  The actual displayable point size
+        // is the one stored in the refData
+        //
+        return m_nPointSize;

     }
 
     inline int GetFamily(void) const
     }
 
     inline int GetFamily(void) const


@@ -188,12 +196,13 @@ public:
             m_nWeight = nWeight;
     }
 
             m_nWeight = nWeight;
     }
 

-    inline void SetFaceName(const wxString& sFaceName)
+    inline bool SetFaceName(const wxString& sFaceName)

     {
         if (m_bNativeFontInfoOk)
     {
         if (m_bNativeFontInfoOk)

-            m_vNativeFontInfo.SetFaceName(sFaceName);
+            return m_vNativeFontInfo.SetFaceName(sFaceName);

         else
             m_sFaceName = sFaceName;
         else
             m_sFaceName = sFaceName;

+        return true;

     }
 
     inline void SetUnderlined(bool bUnderlined)
     }
 
     inline void SetUnderlined(bool bUnderlined)


@@ -253,7 +262,7 @@ protected:
               ,WXHANDLE                hPS   = 0
              );
     //
               ,WXHANDLE                hPS   = 0
              );
     //

-    // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
+    // If true, the pointer to the actual font is temporary and SHOULD NOT BE

     // DELETED by destructor
     //
     bool                            m_bTemporary;
     // DELETED by destructor
     //
     bool                            m_bTemporary;


@@ -288,6 +297,8 @@ protected:
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 

+#define M_FONTDATA ((wxFontRefData*)m_refData)
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -316,10 +327,10 @@ void wxFontRefData::Init(
     m_vEncoding   = vEncoding;
     m_hFont       = 0;
 
     m_vEncoding   = vEncoding;
     m_hFont       = 0;
 

-    m_bNativeFontInfoOk = FALSE;
+    m_bNativeFontInfoOk = false;

 
     m_nFontId     = 0;
 
     m_nFontId     = 0;

-    m_bTemporary  = FALSE;
+    m_bTemporary  = false;

     m_pFM         = (PFONTMETRICS)NULL;
     m_hPS         = NULLHANDLE;
     m_nNumFonts   = 0;
     m_pFM         = (PFONTMETRICS)NULL;
     m_hPS         = NULLHANDLE;
     m_nNumFonts   = 0;


@@ -340,29 +351,35 @@ void wxFontRefData::Init(
     m_hFont = hFont;
     m_nFontId = (int)hFont;
 
     m_hFont = hFont;
     m_nFontId = (int)hFont;
 

-    m_bNativeFontInfoOk = TRUE;
+    m_bNativeFontInfoOk = true;

     m_vNativeFontInfo = rInfo;
 
     m_vNativeFontInfo = rInfo;
 

-    if (m_hPS == NULLHANDLE)
+    if (hPS == NULLHANDLE)

     {
         m_hPS = ::WinGetPS(HWND_DESKTOP);
     {
         m_hPS = ::WinGetPS(HWND_DESKTOP);

-        m_bInternalPS;
+        m_bInternalPS = true;

     }
     else
         m_hPS = (HPS)hPS;
     }
     else
         m_hPS = (HPS)hPS;

-}
+
+    m_nFontId     = 0;
+    m_bTemporary  = false;
+    m_pFM         = (PFONTMETRICS)NULL;
+    m_nNumFonts   = 0;
+} // end of wxFontRefData::Init

 
 wxFontRefData::~wxFontRefData()
 {
     Free();
 }
 
 
 wxFontRefData::~wxFontRefData()
 {
     Free();
 }
 

-bool wxFontRefData::Alloc(
-  wxFont*                           pFont
-)
+bool wxFontRefData::Alloc( wxFont* pFont )

 {
     wxString                        sFaceName;
     long                            flId = m_hFont;
 {
     wxString                        sFaceName;
     long                            flId = m_hFont;

+    long                            lRc;
+    ERRORID                         vError;
+    wxString                        sError;

 
     if (!m_bNativeFontInfoOk)
     {
 
     if (!m_bNativeFontInfoOk)
     {


@@ -374,25 +391,34 @@ bool wxFontRefData::Alloc(
                       ,sFaceName
                       ,pFont
                      );
                       ,sFaceName
                       ,pFont
                      );

-        m_bNativeFontInfoOk = TRUE;
+        m_bNativeFontInfoOk = true;

     }
     }

-
-    if(::GpiCreateLogFont( m_hPS
-                          ,NULL
-                          ,flId
-                          ,&m_vNativeFontInfo.fa
-                         ) != GPI_ERROR)
+    else
+    {
+        if (flId == 0L)
+            flId = 1L;
+        else
+            flId++;
+        if (flId > 254)
+            flId = 1L;
+    }
+    if((lRc = ::GpiCreateLogFont( m_hPS
+                                 ,NULL
+                                 ,flId
+                                 ,&m_vNativeFontInfo.fa
+                                )) != GPI_ERROR)
+    {

        m_hFont = (WXHFONT)flId;
        m_nFontId = flId;
        m_hFont = (WXHFONT)flId;
        m_nFontId = flId;

-
+    }

     if (!m_hFont)
     {
     if (!m_hFont)
     {

-        wxLogLastError("CreateFont");
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogLastError(wxT("CreateFont"));

     }
 
     }
 

-    //
-    // Query for the actual metrics of the current font being used
-    //
+    ::GpiSetCharSet(m_hPS, flId); // sets font for presentation space

     ::GpiQueryFontMetrics(m_hPS, sizeof(FONTMETRICS), &m_vNativeFontInfo.fm);
 
     //
     ::GpiQueryFontMetrics(m_hPS, sizeof(FONTMETRICS), &m_vNativeFontInfo.fm);
 
     //


@@ -400,17 +426,43 @@ bool wxFontRefData::Alloc(
     //
     memcpy(&m_vFattrs, &m_vNativeFontInfo.fa, sizeof(m_vFattrs));
     memcpy(&m_vFname, &m_vNativeFontInfo.fn, sizeof(m_vFname));
     //
     memcpy(&m_vFattrs, &m_vNativeFontInfo.fa, sizeof(m_vFattrs));
     memcpy(&m_vFname, &m_vNativeFontInfo.fn, sizeof(m_vFname));

-    m_nPointSize  = m_vNativeFontInfo.fm.lEmHeight;
-    if (strcmp(m_vNativeFontInfo.fa.szFacename, "Times New Roman") == 0)
+    //
+    // Going to leave the point size alone.  Mostly we use outline fonts
+    // that can be set to any point size inside of Presentation Parameters,
+    // regardless of whether or not the actual font is registered in the system.
+    // The GpiCreateLogFont will do enough by selecting the right family,
+    // and face name.
+    //
+    if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
+        m_nFamily = wxROMAN;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)

         m_nFamily = wxROMAN;
         m_nFamily = wxROMAN;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "WarpSans") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
+        m_nFamily = wxROMAN;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
+        m_nFamily = wxROMAN;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
+        m_nFamily = wxDECORATIVE;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)

         m_nFamily = wxSWISS;
         m_nFamily = wxSWISS;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Script") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
+        m_nFamily = wxSWISS;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)

         m_nFamily = wxSCRIPT;
         m_nFamily = wxSCRIPT;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Courier New") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
+        m_nFamily = wxTELETYPE;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
+        m_nFamily = wxTELETYPE;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
+        m_nFamily = wxTELETYPE;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)

         m_nFamily = wxMODERN;
         m_nFamily = wxMODERN;

-    else if (strcmp(m_vNativeFontInfo.fa.szFacename, "Courier") == 0)
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)

         m_nFamily = wxMODERN;
         m_nFamily = wxMODERN;

+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
+        m_nFamily = wxSWISS;
+    else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
+        m_nFamily = wxSWISS;

     else
         m_nFamily = wxSWISS;
 
     else
         m_nFamily = wxSWISS;
 


@@ -444,7 +496,7 @@ bool wxFontRefData::Alloc(
             m_nWeight = wxFONTWEIGHT_NORMAL;
     }
     m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0);
             m_nWeight = wxFONTWEIGHT_NORMAL;
     }
     m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0);

-    m_sFaceName = m_vNativeFontInfo.fa.szFacename;
+    m_sFaceName = (wxChar*)m_vNativeFontInfo.fa.szFacename;

     m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage);
 
     //
     m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage);
 
     //


@@ -464,7 +516,7 @@ bool wxFontRefData::Alloc(
         // Select the font into the Presentation space
         //
         ::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
         // Select the font into the Presentation space
         //
         ::GpiSetCharSet(m_hPS, flId); // sets font for presentation space

-    return TRUE;
+    return true;

 } // end of wxFontRefData::Alloc
 
 void wxFontRefData::Free()
 } // end of wxFontRefData::Alloc
 
 void wxFontRefData::Free()


@@ -475,10 +527,6 @@ void wxFontRefData::Free()
 
     if ( m_hFont )
     {
 
     if ( m_hFont )
     {

-        if (!::GpiSetCharSet(m_hPS, LCID_DEFAULT))
-        {
-            wxLogLastError(wxT("DeleteObject(font)"));
-        }

         ::GpiDeleteSetId(m_hPS, 1L); /* delete the logical font          */
         m_nFontId = 0;
         m_hFont   = 0;
         ::GpiDeleteSetId(m_hPS, 1L); /* delete the logical font          */
         m_nFontId = 0;
         m_hFont   = 0;


@@ -536,7 +584,7 @@ bool wxNativeFontInfo::GetUnderlined() const
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
 
 wxString wxNativeFontInfo::GetFaceName() const
 {

-    return fm.szFacename;
+    return (wxChar*)fm.szFacename;

 } // end of wxNativeFontInfo::GetFaceName
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
 } // end of wxNativeFontInfo::GetFaceName
 
 wxFontFamily wxNativeFontInfo::GetFamily() const


@@ -546,14 +594,36 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     //
     // Extract family from facename
     //
     //
     // Extract family from facename
     //

-    if (strcmp(fa.szFacename, "Times New Roman") == 0)
+    if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
+        nFamily = wxROMAN;
+    else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)

         nFamily = wxROMAN;
         nFamily = wxROMAN;

-    else if (strcmp(fa.szFacename, "WarpSans") == 0)
+    else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
+        nFamily = wxROMAN;
+    else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
+        nFamily = wxROMAN;
+    else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
+        nFamily = wxDECORATIVE;
+    else if (strcmp(fm.szFamilyname, "Helvetica") == 0)

         nFamily = wxSWISS;
         nFamily = wxSWISS;

-    else if (strcmp(fa.szFacename, "Script") == 0)
+    else if (strcmp(fm.szFamilyname, "Helv") == 0)
+        nFamily = wxSWISS;
+    else if (strcmp(fm.szFamilyname, "Script") == 0)

         nFamily = wxSCRIPT;
         nFamily = wxSCRIPT;

-    else if (strcmp(fa.szFacename, "Courier New") == 0)
+    else if (strcmp(fm.szFamilyname, "Courier New") == 0)
+        nFamily = wxTELETYPE;
+    else if (strcmp(fm.szFamilyname, "Courier") == 0)
+        nFamily = wxTELETYPE;
+    else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
+        nFamily = wxTELETYPE;
+    else if (strcmp(fm.szFamilyname, "System VIO") == 0)
+        nFamily = wxMODERN;
+    else if (strcmp(fm.szFamilyname, "System Proportional") == 0)

         nFamily = wxMODERN;
         nFamily = wxMODERN;

+    else if (strcmp(fm.szFamilyname, "Arial") == 0)
+        nFamily = wxSWISS;
+    else if (strcmp(fm.szFamilyname, "Swiss") == 0)
+        nFamily = wxSWISS;

     else
         nFamily = wxSWISS;
     return (wxFontFamily)nFamily;
     else
         nFamily = wxSWISS;
     return (wxFontFamily)nFamily;


@@ -623,11 +693,12 @@ void wxNativeFontInfo::SetUnderlined(
         fa.fsSelection |= FATTR_SEL_UNDERSCORE;
 } // end of wxNativeFontInfo::SetUnderlined
 
         fa.fsSelection |= FATTR_SEL_UNDERSCORE;
 } // end of wxNativeFontInfo::SetUnderlined
 

-void wxNativeFontInfo::SetFaceName(
-  wxString                          sFacename
+bool wxNativeFontInfo::SetFaceName(
+  const wxString&                   sFacename

 )
 {
 )
 {

-    wxStrncpy(fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+    wxStrncpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+    return true;

 } // end of wxNativeFontInfo::SetFaceName
 
 void wxNativeFontInfo::SetFamily(
 } // end of wxNativeFontInfo::SetFaceName
 
 void wxNativeFontInfo::SetFamily(


@@ -639,40 +710,41 @@ void wxNativeFontInfo::SetFamily(
     switch (eFamily)
     {
         case wxSCRIPT:
     switch (eFamily)
     {
         case wxSCRIPT:

-            sFacename = _T("Script");
+            sFacename = wxT("Tms Rmn");

             break;
 
         case wxDECORATIVE:
             break;
 
         case wxDECORATIVE:

-            sFacename = _T("Times New Roman");
+            sFacename = wxT("WarpSans");

             break;
 
         case wxROMAN:
             break;
 
         case wxROMAN:

-            sFacename = _T("Times New Roman");
+            sFacename = wxT("Tms Rmn");

             break;
 
         case wxTELETYPE:
             break;
 
         case wxTELETYPE:

+            sFacename = wxT("Courier") ;
+            break;
+

         case wxMODERN:
         case wxMODERN:

-            sFacename = _T("Courier New");
+            sFacename = wxT("System VIO") ;

             break;
 
         case wxSWISS:
             break;
 
         case wxSWISS:

-            sFacename = _T("WarpSans");
+            sFacename = wxT("Helv") ;

             break;
 
         case wxDEFAULT:
         default:
             break;
 
         case wxDEFAULT:
         default:

-            sFacename = _T("Helv");
+            sFacename = wxT("System VIO") ;

     }
 
     }
 

-    if (!wxStrlen(fa.szFacename) )
+    if (!wxStrlen((wxChar*)fa.szFacename) )

     {
         SetFaceName(sFacename);
     }
 } // end of wxNativeFontInfo::SetFamily
 
     {
         SetFaceName(sFacename);
     }
 } // end of wxNativeFontInfo::SetFamily
 

-void wxNativeFontInfo::SetEncoding(
-  wxFontEncoding                    eEncoding
-)
+void wxNativeFontInfo::SetEncoding( wxFontEncoding eEncoding )

 {
     wxNativeEncodingInfo            vInfo;
 
 {
     wxNativeEncodingInfo            vInfo;
 


@@ -680,8 +752,7 @@ void wxNativeFontInfo::SetEncoding(
                                   ,&vInfo
                                  ))
     {
                                   ,&vInfo
                                  ))
     {

-#if wxUSE_FONTMAP
-        if (wxTheFontMapper->GetAltForEncoding( eEncoding
+        if (wxFontMapper::Get()->GetAltForEncoding( eEncoding

                                                ,&vInfo
                                               ))
         {
                                                ,&vInfo
                                               ))
         {


@@ -696,18 +767,15 @@ void wxNativeFontInfo::SetEncoding(
             }
         }
         else
             }
         }
         else

-#endif // wxUSE_FONTMAP

         {
             // unsupported encoding, replace with the default
             vInfo.charset = 850;
         }
     }
         {
             // unsupported encoding, replace with the default
             vInfo.charset = 850;
         }
     }

-    fa.usCodePage = vInfo.charset;
+    fa.usCodePage = (USHORT)vInfo.charset;

 } // end of wxNativeFontInfo::SetFaceName
 
 } // end of wxNativeFontInfo::SetFaceName
 

-bool wxNativeFontInfo::FromString(
-  const wxString&                   rsStr
-)
+bool wxNativeFontInfo::FromString( const wxString& rsStr )

 {
     long                            lVal;
 
 {
     long                            lVal;
 


@@ -719,58 +787,58 @@ bool wxNativeFontInfo::FromString(
     wxString                        sToken = vTokenizer.GetNextToken();
 
     if (sToken != _T('0'))
     wxString                        sToken = vTokenizer.GetNextToken();
 
     if (sToken != _T('0'))

-        return FALSE;
+        return false;

 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fm.lEmHeight = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fm.lEmHeight = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.lAveCharWidth = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.lAveCharWidth = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.fsSelection = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsSelection = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.fsType = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsType = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.fsFontUse = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsFontUse = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.idRegistry = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.idRegistry = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.usCodePage = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.usCodePage = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.lMatch = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.lMatch = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fn.usWeightClass = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if(!sToken)
     fn.usWeightClass = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if(!sToken)

-        return FALSE;
-    wxStrcpy(fa.szFacename, sToken.c_str());
-    return TRUE;
+        return false;
+    wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
+    return true;

 } // end of wxNativeFontInfo::FromString
 
 wxString wxNativeFontInfo::ToString() const
 } // end of wxNativeFontInfo::FromString
 
 wxString wxNativeFontInfo::ToString() const


@@ -789,7 +857,7 @@ wxString wxNativeFontInfo::ToString() const
                 fa.usCodePage,
                 fa.lMatch,
                 fn.usWeightClass,
                 fa.usCodePage,
                 fa.lMatch,
                 fn.usWeightClass,

-                fa.szFacename);
+                (char *)fa.szFacename);

     return sStr;
 } // end of wxNativeFontInfo::ToString
 
     return sStr;
 } // end of wxNativeFontInfo::ToString
 


@@ -797,21 +865,15 @@ wxString wxNativeFontInfo::ToString() const
 // wxFont
 // ----------------------------------------------------------------------------
 
 // wxFont
 // ----------------------------------------------------------------------------
 

-void wxFont::Init()
-{
-} // end of wxFont::Init
-
-bool wxFont::Create(
-  const wxNativeFontInfo&           rInfo
-, WXHFONT                           hFont
-)
+bool wxFont::Create( const wxNativeFontInfo& rInfo,
+                     WXHFONT hFont )

 {
     UnRef();
     m_refData = new wxFontRefData( rInfo
                                   ,hFont
                                  );
     RealizeResource();
 {
     UnRef();
     m_refData = new wxFontRefData( rInfo
                                   ,hFont
                                  );
     RealizeResource();

-    return TRUE;
+    return true;

 } // end of wxFont::Create
 
 wxFont::wxFont(
 } // end of wxFont::Create
 
 wxFont::wxFont(


@@ -828,15 +890,13 @@ wxFont::wxFont(
 // 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                               nPointSize
-, int                               nFamily
-, int                               nStyle
-, int                               nWeight
-, bool                              bUnderlined
-, const wxString&                   rsFaceName
-, wxFontEncoding                    vEncoding
-)
+bool wxFont::Create( int             nPointSize,
+                     int             nFamily,
+                     int             nStyle,
+                     int             nWeight,
+                     bool            bUnderlined,
+                     const wxString& rsFaceName,
+                     wxFontEncoding  vEncoding )

 {
     UnRef();
 
 {
     UnRef();
 


@@ -857,7 +917,7 @@ bool wxFont::Create(
                                   ,vEncoding
                                  );
     RealizeResource();
                                   ,vEncoding
                                  );
     RealizeResource();

-    return TRUE;
+    return true;

 } // end of wxFont::Create
 
 wxFont::~wxFont()
 } // end of wxFont::Create
 
 wxFont::~wxFont()


@@ -875,24 +935,22 @@ bool wxFont::RealizeResource()
 {
     if ( GetResourceHandle() )
     {
 {
     if ( GetResourceHandle() )
     {

-        return TRUE;
+        return true;

     }
     return M_FONTDATA->Alloc(this);
 } // end of wxFont::RealizeResource
 
     }
     return M_FONTDATA->Alloc(this);
 } // end of wxFont::RealizeResource
 

-bool wxFont::FreeResource(
-  bool                              bForce
-)
+bool wxFont::FreeResource( bool WXUNUSED(bForce) )

 {
     if (GetResourceHandle())
     {
         M_FONTDATA->Free();
 {
     if (GetResourceHandle())
     {
         M_FONTDATA->Free();

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 } // end of wxFont::FreeResource
 
 } // end of wxFont::FreeResource
 

-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const

 {
     return GetHFONT();
 } // end of wxFont::GetResourceHandle
 {
     return GetHFONT();
 } // end of wxFont::GetResourceHandle


@@ -970,15 +1028,17 @@ void wxFont::SetWeight(
     RealizeResource();
 } // end of wxFont::SetWeight
 
     RealizeResource();
 } // end of wxFont::SetWeight
 

-void wxFont::SetFaceName(
+bool wxFont::SetFaceName(

   const wxString&                   rsFaceName
 )
 {
     Unshare();
 
   const wxString&                   rsFaceName
 )
 {
     Unshare();
 

-    M_FONTDATA->SetFaceName(rsFaceName);
+    bool refdataok = M_FONTDATA->SetFaceName(rsFaceName);

 
     RealizeResource();
 
     RealizeResource();

+
+    return refdataok && wxFontBase::SetFaceName(rsFaceName);

 } // end of wxFont::SetFaceName
 
 void wxFont::SetUnderlined(
 } // end of wxFont::SetFaceName
 
 void wxFont::SetUnderlined(


@@ -1003,7 +1063,7 @@ void wxFont::SetEncoding(
     RealizeResource();
 } // end of wxFont::SetEncoding
 
     RealizeResource();
 } // end of wxFont::SetEncoding
 

-void wxFont::SetNativeFontInfo(
+void wxFont::DoSetNativeFontInfo(

   const wxNativeFontInfo&           rInfo
 )
 {
   const wxNativeFontInfo&           rInfo
 )
 {


@@ -1050,14 +1110,14 @@ 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();
 } // end of wxFont::GetUnderlined
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->GetUnderlined();
 } // end of wxFont::GetUnderlined
 
 wxString wxFont::GetFaceName() const
 {

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

 
     return M_FONTDATA->GetFaceName();
 } // end of wxFont::GetFaceName
 
     return M_FONTDATA->GetFaceName();
 } // end of wxFont::GetFaceName


@@ -1069,34 +1129,27 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->GetEncoding();
 } // end of wxFont::GetEncoding
 
     return M_FONTDATA->GetEncoding();
 } // end of wxFont::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;

 } // end of wxFont::GetNativeFontInfo
 
 //
 // Internal use only method to set the FONTMETRICS array
 //
 } // end of wxFont::GetNativeFontInfo
 
 //
 // Internal use only method to set the FONTMETRICS array
 //

-void wxFont::SetFM(
-  PFONTMETRICS                      pFM
-, int                               nNumFonts
-)
+void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts )

 {
     M_FONTDATA->SetFM(pFM);
     M_FONTDATA->SetNumFonts(nNumFonts);
 } // end of wxFont::SetFM
 
 
 {
     M_FONTDATA->SetFM(pFM);
     M_FONTDATA->SetNumFonts(nNumFonts);
 } // end of wxFont::SetFM
 
 

-void wxFont::SetPS(
-  HPS                               hPS
-)
+void wxFont::SetPS( HPS hPS )

 {
     Unshare();
 
     M_FONTDATA->SetPS(hPS);
 
     RealizeResource();
 {
     Unshare();
 
     M_FONTDATA->SetPS(hPS);
 
     RealizeResource();

-} // end of wxFont::SetUnderlined
-
+} // end of wxFont::SetPS