Got rid of some wierd VisualAge debug nonsense that had appeared in this after the...

[wxWidgets.git] / src / mac / carbon / font.cpp

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 493a6a25baf3dbd7c84cbf073f857397f7e6b494..d425b3cf95f1718e3cfd96704a48c1019afaface 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -16,70 +16,139 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"

+#include "wx/fontutil.h"

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

+#include "wx/utils.h"
+
+#include "wx/fontutil.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 

-wxFontRefData::wxFontRefData()
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+void wxFontRefData::Init(int pointSize,
+                         int family,
+                         int style,
+                         int weight,
+                         bool underlined,
+                         const wxString& faceName,
+                         wxFontEncoding encoding)

 {
 {

-       m_style = 0;
-       m_pointSize = 0;
-       m_family = 0;
-       m_style = 0;
-       m_weight = 0;
-       m_underlined = 0;
-       m_faceName = "";
-/* TODO
-       m_hFont = 0;
-*/
+    m_style = style;
+    m_pointSize = pointSize;
+    m_family = family;
+    m_style = style;
+    m_weight = weight;
+    m_underlined = underlined;
+    m_faceName = faceName;
+    m_encoding = encoding;
+
+       m_macFontNum = 0 ;
+       m_macFontSize = 0;
+       m_macFontStyle = 0;
+    m_fontId = 0;

 }
 
 }
 

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

 {
 {

-       m_style = data.m_style;
-       m_pointSize = data.m_pointSize;
-       m_family = data.m_family;
-       m_style = data.m_style;
-       m_weight = data.m_weight;
-       m_underlined = data.m_underlined;
-       m_faceName = data.m_faceName;
-/* TODO
-       m_hFont = 0;
-*/

 }
 
 }
 

-wxFontRefData::~wxFontRefData()
+void wxFontRefData::MacFindFont()

 {
 {

-    // TODO: delete font data
+       if( m_faceName == "" )
+       {
+               switch( m_family )
+               {
+                       case wxDEFAULT :
+                               m_macFontNum = ::GetAppFont() ;
+                               break ;
+                       case wxDECORATIVE :
+                               ::GetFNum( "\pTimes" , &m_macFontNum) ;
+                               break ;
+                       case wxROMAN :
+                               ::GetFNum( "\pTimes" , &m_macFontNum) ;
+                               break ;
+                       case wxSCRIPT :
+                               ::GetFNum( "\pTimes" , &m_macFontNum) ;
+                               break ;
+                       case wxSWISS :
+                               ::GetFNum( "\pGeneva" , &m_macFontNum) ;
+                               break ;
+                       case wxMODERN :
+                               ::GetFNum( "\pMonaco" , &m_macFontNum) ;
+                               break ;
+               }
+       }
+       else
+       {
+               if ( m_faceName == "systemfont" )
+                       m_macFontNum = ::GetSysFont() ;
+               else if ( m_faceName == "applicationfont" )
+                       m_macFontNum = ::GetAppFont() ;
+               else
+               {
+#if TARGET_CARBON
+                       c2pstrcpy( (StringPtr) wxBuffer, m_faceName ) ;
+#else
+                       strcpy( (char *) wxBuffer, m_faceName ) ;
+                       c2pstr( (char *) wxBuffer ) ;
+#endif
+                       ::GetFNum( (StringPtr) wxBuffer, &m_macFontNum);
+               }
+       }
+
+       m_macFontStyle = 0;
+       if (m_weight == wxBOLD)
+                m_macFontStyle |= bold;
+       if (m_style == wxITALIC || m_style == wxSLANT) 
+               m_macFontStyle |= italic;
+       if (m_underlined) 
+               m_macFontStyle |= underline;
+       m_macFontSize = m_pointSize ;

 }
 
 }
 

-wxFont::wxFont()
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
+
+void wxFont::Init()

 {
     if ( wxTheFontList )
         wxTheFontList->Append(this);
 }
 
 {
     if ( wxTheFontList )
         wxTheFontList->Append(this);
 }
 

-wxFont::wxFont(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
+bool wxFont::Create(const wxNativeFontInfo& info)

 {
 {

-    Create(pointSize, family, style, weight, underlined, faceName);
+    return Create(info.pointSize, info.family, info.style, info.weight,
+                  info.underlined, info.faceName, info.encoding);
+}

 
 

-    if ( wxTheFontList )
-        wxTheFontList->Append(this);
+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);

 }
 
 }
 

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

 {
     UnRef();
 {
     UnRef();

-    m_refData = new wxFontRefData;
-
-    M_FONTDATA->m_family = family;
-    M_FONTDATA->m_style = style;
-    M_FONTDATA->m_weight = weight;
-    M_FONTDATA->m_pointSize = pointSize;
-    M_FONTDATA->m_underlined = underlined;
-    M_FONTDATA->m_faceName = faceName;
+    m_refData = new wxFontRefData(pointSize, family, style, weight,
+                                  underlined, faceName, encoding);

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -94,8 +163,17 @@ wxFont::~wxFont()
 
 bool wxFont::RealizeResource()
 {
 
 bool wxFont::RealizeResource()
 {

-    // TODO: create the font (if there is a native font object)
-    return FALSE;
+       M_FONTDATA->MacFindFont() ;
+    return TRUE;
+}
+
+void wxFont::SetEncoding(wxFontEncoding encoding)
+{
+    Unshare();
+
+    M_FONTDATA->m_encoding = encoding;
+
+    RealizeResource();

 }
 
 void wxFont::Unshare()
 }
 
 void wxFont::Unshare()


@@ -167,78 +245,45 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-wxString wxFont::GetFamilyString() const
-{
-  wxString fam("");
-  switch (GetFamily())
-  {
-    case wxDECORATIVE:
-      fam = "wxDECORATIVE";
-      break;
-    case wxROMAN:
-      fam = "wxROMAN";
-      break;
-    case wxSCRIPT:
-      fam = "wxSCRIPT";
-      break;
-    case wxSWISS:
-      fam = "wxSWISS";
-      break;
-    case wxMODERN:
-      fam = "wxMODERN";
-      break;
-    case wxTELETYPE:
-      fam = "wxTELETYPE";
-      break;
-    default:
-      fam = "wxDEFAULT";
-      break;
-  }
-  return fam;
-}
-
-/* New font system */
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+int wxFont::GetPointSize() const
+{
+    return M_FONTDATA->m_pointSize;
+}
+
+int wxFont::GetFamily() const
+{
+    return M_FONTDATA->m_family;
+}
+
+int wxFont::GetStyle() const
+{
+    return M_FONTDATA->m_style;
+}
+
+int wxFont::GetWeight() const
+{
+    return M_FONTDATA->m_weight;
+}
+
+bool wxFont::GetUnderlined() const
+{
+    return M_FONTDATA->m_underlined;
+}
+

 wxString wxFont::GetFaceName() const
 {
 wxString wxFont::GetFaceName() const
 {

-    wxString str("");
-    if (M_FONTDATA)
-           str = M_FONTDATA->m_faceName ;
+    wxString str;
+    if ( M_FONTDATA )
+        str = M_FONTDATA->m_faceName ;

     return str;
 }
 
     return str;
 }
 

-wxString wxFont::GetStyleString() const
+wxFontEncoding wxFont::GetEncoding() const

 {
 {

-    wxString styl("");
-    switch (GetStyle())
-    {
-        case wxITALIC:
-            styl = "wxITALIC";
-            break;
-        case wxSLANT:
-            styl = "wxSLANT";
-            break;
-        default:
-            styl = "wxNORMAL";
-            break;
-    }
-    return styl;
-}
-
-wxString wxFont::GetWeightString() const
-{
-    wxString w("");
-    switch (GetWeight())
-    {
-        case wxBOLD:
-            w = "wxBOLD";
-            break;
-        case wxLIGHT:
-            w = "wxLIGHT";
-            break;
-        default:
-            w = "wxNORMAL";
-            break;
-    }
-    return w;
+    return M_FONTDATA->m_encoding;

 }
 
 }