fixing osx_carbon

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 88f305dc51dcffee0eb696dea0acb123a1256467..80ebeb2682f68bc4515008866fe14131423421ec 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -40,8 +40,6 @@
 
 #include <malloc.h>
 
 
 #include <malloc.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-

 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font
 // ----------------------------------------------------------------------------


@@ -56,9 +54,9 @@ public:
     }
 
     wxFontRefData( int             nSize
     }
 
     wxFontRefData( int             nSize

-                  ,int             nFamily
-                  ,int             nStyle
-                  ,int             nWeight
+                  ,wxFontFamily    nFamily
+                  ,wxFontStyle     nStyle
+                  ,wxFontWeight    nWeight

                   ,bool            bUnderlined
                   ,const wxString& sFaceName
                   ,wxFontEncoding  vEncoding
                   ,bool            bUnderlined
                   ,const wxString& sFaceName
                   ,wxFontEncoding  vEncoding


@@ -120,18 +118,18 @@ public:
         return m_nPointSize;
     }
 
         return m_nPointSize;
     }
 

-    inline int GetFamily(void) const
+    inline wxFontFamily GetFamily(void) const

     {
         return m_nFamily;
     }
 
     {
         return m_nFamily;
     }
 

-    inline int GetStyle(void) const
+    inline wxFontStyle GetStyle(void) const

     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
                                    : m_nStyle;
     }
 
     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
                                    : m_nStyle;
     }
 

-    inline int GetWeight(void) const
+    inline wxFontWeight GetWeight(void) const

     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
                                    : m_nWeight;
     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
                                    : m_nWeight;


@@ -175,23 +173,23 @@ public:
             m_nPointSize = nPointSize;
     }
 
             m_nPointSize = nPointSize;
     }
 

-    inline void SetFamily(int nFamily)
+    inline void SetFamily(wxFontFamily nFamily)

     {
         m_nFamily = nFamily;
     }
 
     {
         m_nFamily = nFamily;
     }
 

-    inline void SetStyle(int nStyle)
+    inline void SetStyle(wxFontStyle nStyle)

     {
         if (m_bNativeFontInfoOk)
     {
         if (m_bNativeFontInfoOk)

-            m_vNativeFontInfo.SetStyle((wxFontStyle)nStyle);
+            m_vNativeFontInfo.SetStyle(nStyle);

         else
             m_nStyle = nStyle;
     }
 
         else
             m_nStyle = nStyle;
     }
 

-    inline void SetWeight(int nWeight)
+    inline void SetWeight(wxFontWeight nWeight)

     {
         if (m_bNativeFontInfoOk)
     {
         if (m_bNativeFontInfoOk)

-            m_vNativeFontInfo.SetWeight((wxFontWeight)nWeight);
+            m_vNativeFontInfo.SetWeight(nWeight);

         else
             m_nWeight = nWeight;
     }
         else
             m_nWeight = nWeight;
     }


@@ -249,9 +247,9 @@ protected:
     // Common part of all ctors
     //
     void Init( int             nSize
     // Common part of all ctors
     //
     void Init( int             nSize

-              ,int             nFamily
-              ,int             nStyle
-              ,int             nWeight
+              ,wxFontFamily    nFamily
+              ,wxFontStyle     nStyle
+              ,wxFontWeight    nWeight

               ,bool            bUnderlined
               ,const wxString& rsFaceName
               ,wxFontEncoding  vEncoding
               ,bool            bUnderlined
               ,const wxString& rsFaceName
               ,wxFontEncoding  vEncoding


@@ -272,9 +270,9 @@ protected:
     // Font characterstics
     //
     int                             m_nPointSize;
     // Font characterstics
     //
     int                             m_nPointSize;

-    wxFontFamily                    m_family;
-    wxFontStyle                     m_style;
-    wxFontWeight                    m_weight;
+    wxFontFamily                    m_nFamily;
+    wxFontStyle                     m_nStyle;
+    wxFontWeight                    m_nWeight;

     bool                            m_bUnderlined;
     wxString                        m_sFaceName;
     wxFontEncoding                  m_vEncoding;
     bool                            m_bUnderlined;
     wxString                        m_sFaceName;
     wxFontEncoding                  m_vEncoding;


@@ -309,9 +307,9 @@ protected:
 
 void wxFontRefData::Init(
   int                               nPointSize
 
 void wxFontRefData::Init(
   int                               nPointSize

-, int                               nFamily
-, int                               nStyle
-, int                               nWeight
+, wxFontFamily                      nFamily
+, wxFontStyle                       nStyle
+, wxFontWeight                      nWeight

 , bool                              bUnderlined
 , const wxString&                   rsFaceName
 , wxFontEncoding                    vEncoding
 , bool                              bUnderlined
 , const wxString&                   rsFaceName
 , wxFontEncoding                    vEncoding


@@ -434,37 +432,37 @@ bool wxFontRefData::Alloc( wxFont* pFont )
     // and face name.
     //
     if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
     // and face name.
     //
     if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)

-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)

-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)

-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)

-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)

-        m_nFamily = wxDECORATIVE;
+        m_nFamily = wxFONTFAMILY_DECORATIVE;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)

-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)

-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)

-        m_nFamily = wxSCRIPT;
+        m_nFamily = wxFONTFAMILY_SCRIPT;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)

-        m_nFamily = wxTELETYPE;
+        m_nFamily = wxFONTFAMILY_TELETYPE;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)

-        m_nFamily = wxTELETYPE;
+        m_nFamily = wxFONTFAMILY_TELETYPE;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)

-        m_nFamily = wxTELETYPE;
+        m_nFamily = wxFONTFAMILY_TELETYPE;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)

-        m_nFamily = wxMODERN;
+        m_nFamily = wxFONTFAMILY_MODERN;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)

-        m_nFamily = wxMODERN;
+        m_nFamily = wxFONTFAMILY_MODERN;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)

-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;

     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)

-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;

     else
     else

-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;

 
     if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
         m_nStyle = wxFONTSTYLE_ITALIC;
 
     if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
         m_nStyle = wxFONTSTYLE_ITALIC;


@@ -595,37 +593,37 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     // Extract family from facename
     //
     if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
     // Extract family from facename
     //
     if (strcmp(fm.szFamilyname, "Times New Roman") == 0)

-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)
     else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)

-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
     else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)

-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
     else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)

-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;

     else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
     else if (strcmp(fm.szFamilyname, "WarpSans") == 0)

-        nFamily = wxDECORATIVE;
+        nFamily = wxFONTFAMILY_DECORATIVE;

     else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
     else if (strcmp(fm.szFamilyname, "Helvetica") == 0)

-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;

     else if (strcmp(fm.szFamilyname, "Helv") == 0)
     else if (strcmp(fm.szFamilyname, "Helv") == 0)

-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;

     else if (strcmp(fm.szFamilyname, "Script") == 0)
     else if (strcmp(fm.szFamilyname, "Script") == 0)

-        nFamily = wxSCRIPT;
+        nFamily = wxFONTFAMILY_SCRIPT;

     else if (strcmp(fm.szFamilyname, "Courier New") == 0)
     else if (strcmp(fm.szFamilyname, "Courier New") == 0)

-        nFamily = wxTELETYPE;
+        nFamily = wxFONTFAMILY_TELETYPE;

     else if (strcmp(fm.szFamilyname, "Courier") == 0)
     else if (strcmp(fm.szFamilyname, "Courier") == 0)

-        nFamily = wxTELETYPE;
+        nFamily = wxFONTFAMILY_TELETYPE;

     else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
     else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)

-        nFamily = wxTELETYPE;
+        nFamily = wxFONTFAMILY_TELETYPE;

     else if (strcmp(fm.szFamilyname, "System VIO") == 0)
     else if (strcmp(fm.szFamilyname, "System VIO") == 0)

-        nFamily = wxMODERN;
+        nFamily = wxFONTFAMILY_MODERN;

     else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
     else if (strcmp(fm.szFamilyname, "System Proportional") == 0)

-        nFamily = wxMODERN;
+        nFamily = wxFONTFAMILY_MODERN;

     else if (strcmp(fm.szFamilyname, "Arial") == 0)
     else if (strcmp(fm.szFamilyname, "Arial") == 0)

-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;

     else if (strcmp(fm.szFamilyname, "Swiss") == 0)
     else if (strcmp(fm.szFamilyname, "Swiss") == 0)

-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;

     else
     else

-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;

     return (wxFontFamily)nFamily;
 } // end of wxNativeFontInfo::GetFamily
 
     return (wxFontFamily)nFamily;
 } // end of wxNativeFontInfo::GetFamily
 


@@ -648,7 +646,7 @@ void wxNativeFontInfo::SetStyle(
     switch (eStyle)
     {
         default:
     switch (eStyle)
     {
         default:

-            wxFAIL_MSG( _T("unknown font style") );
+            wxFAIL_MSG( wxT("unknown font style") );

             // fall through
 
         case wxFONTSTYLE_NORMAL:
             // fall through
 
         case wxFONTSTYLE_NORMAL:


@@ -668,7 +666,7 @@ void wxNativeFontInfo::SetWeight(
     switch (eWeight)
     {
         default:
     switch (eWeight)
     {
         default:

-            wxFAIL_MSG( _T("unknown font weight") );
+            wxFAIL_MSG( wxT("unknown font weight") );

             // fall through
 
         case wxFONTWEIGHT_NORMAL:
             // fall through
 
         case wxFONTWEIGHT_NORMAL:


@@ -697,7 +695,7 @@ bool wxNativeFontInfo::SetFaceName(
   const wxString&                   sFacename
 )
 {
   const wxString&                   sFacename
 )
 {

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

     return true;
 } // end of wxNativeFontInfo::SetFaceName
 
     return true;
 } // end of wxNativeFontInfo::SetFaceName
 


@@ -709,31 +707,31 @@ void wxNativeFontInfo::SetFamily(
 
     switch (eFamily)
     {
 
     switch (eFamily)
     {

-        case wxSCRIPT:
+        case wxFONTFAMILY_SCRIPT:

             sFacename = wxT("Tms Rmn");
             break;
 
             sFacename = wxT("Tms Rmn");
             break;
 

-        case wxDECORATIVE:
+        case wxFONTFAMILY_DECORATIVE:

             sFacename = wxT("WarpSans");
             break;
 
             sFacename = wxT("WarpSans");
             break;
 

-        case wxROMAN:
+        case wxFONTFAMILY_ROMAN:

             sFacename = wxT("Tms Rmn");
             break;
 
             sFacename = wxT("Tms Rmn");
             break;
 

-        case wxTELETYPE:
+        case wxFONTFAMILY_TELETYPE:

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

-        case wxMODERN:
+        case wxFONTFAMILY_MODERN:

             sFacename = wxT("System VIO") ;
             break;
 
             sFacename = wxT("System VIO") ;
             break;
 

-        case wxSWISS:
+        case wxFONTFAMILY_SWISS:

             sFacename = wxT("Helv") ;
             break;
 
             sFacename = wxT("Helv") ;
             break;
 

-        case wxDEFAULT:
+        case wxFONTFAMILY_DEFAULT:

         default:
             sFacename = wxT("System VIO") ;
     }
         default:
             sFacename = wxT("System VIO") ;
     }


@@ -779,14 +777,14 @@ bool wxNativeFontInfo::FromString( const wxString& rsStr )
 {
     long                            lVal;
 
 {
     long                            lVal;
 

-    wxStringTokenizer               vTokenizer(rsStr, _T(";"));
+    wxStringTokenizer               vTokenizer(rsStr, wxT(";"));

 
     //
     // First the version
     //
     wxString                        sToken = vTokenizer.GetNextToken();
 
 
     //
     // First the version
     //
     wxString                        sToken = vTokenizer.GetNextToken();
 

-    if (sToken != _T('0'))
+    if (sToken != wxT('0'))

         return false;
 
     sToken = vTokenizer.GetNextToken();
         return false;
 
     sToken = vTokenizer.GetNextToken();


@@ -845,7 +843,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString sStr;
 
 {
     wxString sStr;
 

-    sStr.Printf(_T("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"),
+    sStr.Printf(wxT("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"),

                 0, // version, in case we want to change the format later
                 fm.lEmHeight,
                 fa.lAveCharWidth,
                 0, // version, in case we want to change the format later
                 fm.lEmHeight,
                 fa.lAveCharWidth,


@@ -927,7 +925,7 @@ wxFont::~wxFont()
 // ----------------------------------------------------------------------------
 // real implementation
 // Boris' Kovalenko comments:
 // ----------------------------------------------------------------------------
 // real implementation
 // Boris' Kovalenko comments:

-//   Because OS/2 fonts are associated with PS we can not create the font
+//   Because OS/2 fonts are associated with PS we cannot create the font

 //   here, but we may check that font definition is true
 // ----------------------------------------------------------------------------
 
 //   here, but we may check that font definition is true
 // ----------------------------------------------------------------------------
 


@@ -991,7 +989,7 @@ void wxFont::SetPointSize(
 } // end of wxFont::SetPointSize
 
 void wxFont::SetFamily(
 } // end of wxFont::SetPointSize
 
 void wxFont::SetFamily(

-  int                               nFamily
+  wxFontFamily                      nFamily

 )
 {
     AllocExclusive();
 )
 {
     AllocExclusive();


@@ -1002,7 +1000,7 @@ void wxFont::SetFamily(
 } // end of wxFont::SetFamily
 
 void wxFont::SetStyle(
 } // end of wxFont::SetFamily
 
 void wxFont::SetStyle(

-  int                               nStyle
+  wxFontStyle                       nStyle

 )
 {
     AllocExclusive();
 )
 {
     AllocExclusive();


@@ -1013,7 +1011,7 @@ void wxFont::SetStyle(
 } // end of wxFont::SetStyle
 
 void wxFont::SetWeight(
 } // end of wxFont::SetStyle
 
 void wxFont::SetWeight(

-  int                               nWeight
+  wxFontWeight                      nWeight

 )
 {
     AllocExclusive();
 )
 {
     AllocExclusive();


@@ -1077,49 +1075,47 @@ void wxFont::DoSetNativeFontInfo(
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

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

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

-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const

 {
 {

-    wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
-

     return M_FONTDATA->GetFamily();
     return M_FONTDATA->GetFamily();

-} // end of wxFont::GetFamily
+} // end of wxFont::DoGetFamily

 
 wxFontStyle wxFont::GetStyle() const
 {
 
 wxFontStyle wxFont::GetStyle() const
 {

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

 
     return M_FONTDATA->GetStyle();
 } // end of wxFont::GetStyle
 
 wxFontWeight wxFont::GetWeight() const
 {
 
     return M_FONTDATA->GetStyle();
 } // end of wxFont::GetStyle
 
 wxFontWeight wxFont::GetWeight() const
 {

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

 
     return M_FONTDATA->GetWeight();
 }
 
 bool wxFont::GetUnderlined() const
 {
 
     return M_FONTDATA->GetWeight();
 }
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), 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(), wxEmptyString, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );

 
     return M_FONTDATA->GetFaceName();
 } // end of wxFont::GetFaceName
 
 wxFontEncoding wxFont::GetEncoding() const
 {
 
     return M_FONTDATA->GetFaceName();
 } // end of wxFont::GetFaceName
 
 wxFontEncoding wxFont::GetEncoding() const
 {

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

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