use wxVector<T> instead of OBJARRAY macros for wxHtmlTextPieces (slightly better...

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index cbb29b48a59d7eb35c22b53cf8f9b2a87768665c..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,17 +20,13 @@
 // 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/log.h"
 #endif // WX_PRECOMP
 


@@ -39,6 +38,8 @@
 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 

+#include <malloc.h>
+

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


@@ -50,7 +51,7 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData()
     {
 public:
     wxFontRefData()
     {

-        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE,
+        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,

              wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 
              wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 


@@ -195,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)


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


@@ -295,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
 // ============================================================================


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


@@ -347,19 +351,19 @@ 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;
 
     if (hPS == NULLHANDLE)
     {
         m_hPS = ::WinGetPS(HWND_DESKTOP);
     m_vNativeFontInfo = rInfo;
 
     if (hPS == NULLHANDLE)
     {
         m_hPS = ::WinGetPS(HWND_DESKTOP);

-        m_bInternalPS = TRUE;
+        m_bInternalPS = true;

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

-    m_bTemporary  = FALSE;
+    m_bTemporary  = false;

     m_pFM         = (PFONTMETRICS)NULL;
     m_nNumFonts   = 0;
 } // end of wxFontRefData::Init
     m_pFM         = (PFONTMETRICS)NULL;
     m_nNumFonts   = 0;
 } // end of wxFontRefData::Init


@@ -369,9 +373,7 @@ wxFontRefData::~wxFontRefData()
     Free();
 }
 
     Free();
 }
 

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

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


@@ -389,7 +391,7 @@ bool wxFontRefData::Alloc(
                       ,sFaceName
                       ,pFont
                      );
                       ,sFaceName
                       ,pFont
                      );

-        m_bNativeFontInfoOk = TRUE;
+        m_bNativeFontInfoOk = true;

     }
     else
     {
     }
     else
     {


@@ -514,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()


@@ -691,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((wxChar*)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(


@@ -741,9 +744,7 @@ void wxNativeFontInfo::SetFamily(
     }
 } // end of wxNativeFontInfo::SetFamily
 
     }
 } // end of wxNativeFontInfo::SetFamily
 

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

 {
     wxNativeEncodingInfo            vInfo;
 
 {
     wxNativeEncodingInfo            vInfo;
 


@@ -771,12 +772,10 @@ void wxNativeFontInfo::SetEncoding(
             vInfo.charset = 850;
         }
     }
             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;
 


@@ -788,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;
+        return false;

     wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
     wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());

-    return TRUE;
+    return true;

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


@@ -858,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
 


@@ -866,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(


@@ -897,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();
 


@@ -926,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()


@@ -944,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


@@ -1039,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(


@@ -1119,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


@@ -1147,19 +1138,14 @@ const wxNativeFontInfo* wxFont::GetNativeFontInfo() const
 //
 // Internal use only method to set the FONTMETRICS array
 //
 //
 // 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();
 
 {
     Unshare();
 


@@ -1167,4 +1153,3 @@ void wxFont::SetPS(
 
     RealizeResource();
 } // end of wxFont::SetPS
 
     RealizeResource();
 } // end of wxFont::SetPS

-