wxFileSystem now compiles if wxUSE_HTML (required by wxHTML)

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

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 958d7db27016cf7fad52a2bec3797565860775d7..a957f4f68ae6fe08227e0e3d5a12a0bc9f42f4e2 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -20,6 +20,8 @@
 #endif
 
 #include "wx/font.h"
 #endif
 
 #include "wx/font.h"

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

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


@@ -27,7 +29,7 @@
 
 #include <strings.h>
 
 
 #include <strings.h>
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData


@@ -122,7 +124,7 @@ wxFontRefData::wxFontRefData(int size, int family, int style,
     int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding )
     : m_scaled_xfonts(wxKEY_INTEGER)
 {
     int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding )
     : m_scaled_xfonts(wxKEY_INTEGER)
 {

-    Init(size, family, style, weight, 
+    Init(size, family, style, weight,

         underlined, faceName, encoding);
 }
 
         underlined, faceName, encoding);
 }
 


@@ -150,49 +152,95 @@ void wxFont::Init()
         wxTheFontList->Append( this );
 }
 
         wxTheFontList->Append( this );
 }
 

-wxFont::wxFont( GdkFont *font, char *xFontName )
+wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata )

 {
 {

-    if (!xFontName)
-        return;
-

     Init();
 
     Init();
 

+    wxCHECK_RET( !!fontname, _T("invalid font spec") );
+

     m_refData = new wxFontRefData();
 
     wxString tmp;
 
     m_refData = new wxFontRefData();
 
     wxString tmp;
 

-    wxString fontname( xFontName );
-    wxStringTokenizer tn( fontname, _T("-") );
+    wxStringTokenizer tn( fontname, wxT("-") );

 
     tn.GetNextToken();                           // foundry
 
 
     tn.GetNextToken();                           // foundry
 

-    M_FONTDATA->m_faceName = tn.GetNextToken();  // courier
+    M_FONTDATA->m_faceName = tn.GetNextToken();  // family

 
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+    tmp = tn.GetNextToken().MakeUpper();         // weight
+    if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD;

 
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == _T("O")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
+    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+
+    tmp = tn.GetNextToken().MakeUpper();        // slant
+    if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;

 
     tn.GetNextToken();                           // set width
 
     tn.GetNextToken();                           // set width

-    tn.GetNextToken();                           // ?
+    tn.GetNextToken();                           // add. style

     tn.GetNextToken();                           // pixel size
 
     tmp = tn.GetNextToken();                     // pointsize
     tn.GetNextToken();                           // pixel size
 
     tmp = tn.GetNextToken();                     // pointsize

-    int num =  wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
-    M_FONTDATA->m_pointSize = num / 10;
+    long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+    M_FONTDATA->m_pointSize = (int)(num / 10);

 
     tn.GetNextToken();                           // x-res
     tn.GetNextToken();                           // y-res
 
 
     tn.GetNextToken();                           // x-res
     tn.GetNextToken();                           // y-res
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == _T("M")) M_FONTDATA->m_family = wxMODERN;
-    else if (M_FONTDATA->m_faceName == _T("TIMES")) M_FONTDATA->m_family = wxROMAN;
-    else if (M_FONTDATA->m_faceName == _T("HELVETICA")) M_FONTDATA->m_family = wxSWISS;
-    else if (M_FONTDATA->m_faceName == _T("LUCIDATYPEWRITER")) M_FONTDATA->m_family = wxTELETYPE;
-    else if (M_FONTDATA->m_faceName == _T("LUCIDA")) M_FONTDATA->m_family = wxDECORATIVE;
-    else if (M_FONTDATA->m_faceName == _T("UTOPIA")) M_FONTDATA->m_family = wxSCRIPT;
+    tmp = tn.GetNextToken().MakeUpper();         // spacing
+
+    if (tmp == wxT("M"))
+        M_FONTDATA->m_family = wxMODERN;
+    else if (M_FONTDATA->m_faceName == wxT("TIMES"))
+        M_FONTDATA->m_family = wxROMAN;
+    else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))
+        M_FONTDATA->m_family = wxSWISS;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))
+        M_FONTDATA->m_family = wxTELETYPE;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))
+        M_FONTDATA->m_family = wxDECORATIVE;
+    else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))
+        M_FONTDATA->m_family = wxSCRIPT;
+
+    tn.GetNextToken();                           // avg width
+
+    // deal with font encoding
+    M_FONTDATA->m_encoding = fontdata.GetEncoding();
+    if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM )
+    {
+        wxString registry = tn.GetNextToken().MakeUpper(),
+                 encoding = tn.GetNextToken().MakeUpper();
+
+        if ( registry == _T("ISO8859") )
+        {
+            int cp;
+            if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
+            {
+                M_FONTDATA->m_encoding =
+                    (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
+            }
+        }
+        else if ( registry == _T("MICROSOFT") )
+        {
+            int cp;
+            if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
+            {
+                M_FONTDATA->m_encoding =
+                    (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
+            }
+        }
+        else if ( registry == _T("KOI8") )
+        {
+            M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
+        }
+        //else: unknown encoding - may be give a warning here?
+    }

 }
 
 bool wxFont::Create( int pointSize,
 }
 
 bool wxFont::Create( int pointSize,


@@ -235,42 +283,42 @@ wxFont::~wxFont()
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

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

 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {

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

 
     return M_FONTDATA->m_faceName;
 }
 
 int wxFont::GetFamily() const
 {
 
     return M_FONTDATA->m_faceName;
 }
 
 int wxFont::GetFamily() const
 {

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

 
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {
 
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {

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

 
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
 
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {

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

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

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

 
     return M_FONTDATA->m_underlined;
 }
 
     return M_FONTDATA->m_underlined;
 }


@@ -278,7 +326,7 @@ bool wxFont::GetUnderlined() const
 
 wxFontEncoding wxFont::GetEncoding() const
 {
 
 wxFontEncoding wxFont::GetEncoding() const
 {

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

 
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }


@@ -344,13 +392,13 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 {
     if (!Ok())
     {
 {
     if (!Ok())
     {

-        wxFAIL_MSG( _T("invalid font") );
+        wxFAIL_MSG( wxT("invalid font") );

 
         return (GdkFont*) NULL;
     }
 
     long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */
 
         return (GdkFont*) NULL;
     }
 
     long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */

-    int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100;
+    int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);

     GdkFont *font = (GdkFont *) NULL;
 
     wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
     GdkFont *font = (GdkFont *) NULL;
 
     wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);


@@ -385,10 +433,9 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
         M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
     }
 
         M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
     }
 

-    if (!font)
-    {
-        wxLogError(_T("could not load any font"));
-    }
+    // it's quite useless to make it a wxCHECK because we're going to crash
+    // anyhow...
+    wxASSERT_MSG( font, wxT("could not load any font?") );

 
     return font;
 }
 
     return font;
 }