check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 04da6ccac7e31e95176f231cd2a183babf19de02..94cc8e66d5f6e10f0bd29d7444f2d11ae0429448 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -19,18 +19,19 @@
 #include "wx/wxprec.h"
 
 #include "wx/font.h"
 #include "wx/wxprec.h"
 
 #include "wx/font.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"
+#endif
+

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

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

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

-#include "wx/settings.h"
-
-#include <strings.h>

 
 #include "wx/gtk/private.h"
 
 #include "wx/gtk/private.h"

-#include <gdk/gdkprivate.h>

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -58,7 +59,7 @@ public:
                   int family = wxFONTFAMILY_DEFAULT,
                   int style = wxFONTSTYLE_NORMAL,
                   int weight = wxFONTWEIGHT_NORMAL,
                   int family = wxFONTFAMILY_DEFAULT,
                   int style = wxFONTSTYLE_NORMAL,
                   int weight = wxFONTWEIGHT_NORMAL,

-                  bool underlined = FALSE,
+                  bool underlined = false,

                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 


@@ -74,7 +75,7 @@ public:
     bool HasNativeFont() const
     {
         // we always have a Pango font description
     bool HasNativeFont() const
     {
         // we always have a Pango font description

-        return TRUE;
+        return true;

     }
 
     // setters: all of them also take care to modify m_nativeFontInfo if we
     }
 
     // setters: all of them also take care to modify m_nativeFontInfo if we


@@ -84,10 +85,10 @@ public:
     void SetStyle(int style);
     void SetWeight(int weight);
     void SetUnderlined(bool underlined);
     void SetStyle(int style);
     void SetWeight(int weight);
     void SetUnderlined(bool underlined);

-    void SetFaceName(const wxString& facename);
+    bool SetFaceName(const wxString& facename);

     void SetEncoding(wxFontEncoding encoding);
 
     void SetEncoding(wxFontEncoding encoding);
 

-    void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
+    void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }

     bool GetNoAntiAliasing() const { return m_noAA; }
 
     // and this one also modifies all the other font data fields
     bool GetNoAntiAliasing() const { return m_noAA; }
 
     // and this one also modifies all the other font data fields


@@ -116,7 +117,7 @@ private:
                     m_weight;
     bool            m_underlined;
     wxString        m_faceName;
                     m_weight;
     bool            m_underlined;
     wxString        m_faceName;

-    wxFontEncoding  m_encoding;  // Unused under GTK 2.0
+    wxFontEncoding  m_encoding;

     bool            m_noAA;      // No anti-aliasing
 
     // The native font info, basicly an XFLD under GTK 1.2 and
     bool            m_noAA;      // No anti-aliasing
 
     // The native font info, basicly an XFLD under GTK 1.2 and


@@ -126,6 +127,8 @@ private:
     friend class wxFont;
 };
 
     friend class wxFont;
 };
 

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

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


@@ -154,8 +157,10 @@ void wxFontRefData::Init(int pointSize,
 
     m_underlined = underlined;
     m_encoding = encoding;
 
     m_underlined = underlined;
     m_encoding = encoding;

+    if ( m_encoding == wxFONTENCODING_DEFAULT )
+        m_encoding = wxFont::GetDefaultEncoding();

 
 

-    m_noAA = FALSE;
+    m_noAA = false;

 
     // Create native font info
     m_nativeFontInfo.description = pango_font_description_new();
 
     // Create native font info
     m_nativeFontInfo.description = pango_font_description_new();


@@ -163,7 +168,8 @@ void wxFontRefData::Init(int pointSize,
     // And set its values
     if (!m_faceName.empty())
     {
     // And set its values
     if (!m_faceName.empty())
     {

-       pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) );
+       pango_font_description_set_family( m_nativeFontInfo.description,
+                                          wxGTK_CONV_SYS(m_faceName) );

     }
     else
     {
     }
     else
     {


@@ -191,13 +197,13 @@ void wxFontRefData::Init(int pointSize,
 
 void wxFontRefData::InitFromNative()
 {
 
 void wxFontRefData::InitFromNative()
 {

-    m_noAA = FALSE;
+    m_noAA = false;

 
     // Get native info
     PangoFontDescription *desc = m_nativeFontInfo.description;
 
     // init fields
 
     // Get native info
     PangoFontDescription *desc = m_nativeFontInfo.description;
 
     // init fields

-    m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
+    m_faceName = wxGTK_CONV_BACK_SYS(pango_font_description_get_family(desc));

 
     // Pango sometimes needs to have a size
     int pango_size = pango_font_description_get_size( desc );
 
     // Pango sometimes needs to have a size
     int pango_size = pango_font_description_get_size( desc );


@@ -226,10 +232,10 @@ void wxFontRefData::InitFromNative()
     }
 
     // Pango description are never underlined (?)
     }
 
     // Pango description are never underlined (?)

-    m_underlined = FALSE;
+    m_underlined = false;

 
 

-    // Cannot we choose that
-    m_encoding = wxFONTENCODING_SYSTEM;
+    // always with GTK+ 2
+    m_encoding = wxFONTENCODING_UTF8;

 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )


@@ -316,11 +322,11 @@ void wxFontRefData::SetUnderlined(bool underlined)
     // the XLFD doesn't have "underlined" field anyhow
 }
 
     // the XLFD doesn't have "underlined" field anyhow
 }
 

-void wxFontRefData::SetFaceName(const wxString& facename)
+bool wxFontRefData::SetFaceName(const wxString& facename)

 {
     m_faceName = facename;
 
 {
     m_faceName = facename;
 

-    m_nativeFontInfo.SetFaceName(facename);
+    return m_nativeFontInfo.SetFaceName(facename);

 }
 
 void wxFontRefData::SetEncoding(wxFontEncoding encoding)
 }
 
 void wxFontRefData::SetEncoding(wxFontEncoding encoding)


@@ -369,7 +375,7 @@ bool wxFont::Create( int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 

-    return TRUE;
+    return true;

 }
 
 bool wxFont::Create(const wxString& fontname)
 }
 
 bool wxFont::Create(const wxString& fontname)


@@ -379,26 +385,12 @@ bool wxFont::Create(const wxString& fontname)
     {
         *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     {
         *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 

-        return TRUE;
+        return true;

     }
 
     m_refData = new wxFontRefData(fontname);
 
     }
 
     m_refData = new wxFontRefData(fontname);
 

-    return TRUE;
-}
-
-void wxFont::Unshare()
-{
-    if (!m_refData)
-    {
-        m_refData = new wxFontRefData();
-    }
-    else
-    {
-        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
+    return true;

 }
 
 wxFont::~wxFont()
 }
 
 wxFont::~wxFont()


@@ -413,31 +405,22 @@ int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
                                        : M_FONTDATA->m_pointSize;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
                                        : M_FONTDATA->m_pointSize;

-#else
-    return M_FONTDATA->m_pointSize;
-#endif

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

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

 
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
                                        : M_FONTDATA->m_faceName;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
                                        : M_FONTDATA->m_faceName;

-#else
-    return M_FONTDATA->m_faceName;
-#endif

 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     int ret = M_FONTDATA->m_family;
     if (M_FONTDATA->HasNativeFont())
         // wxNativeFontInfo::GetFamily is expensive, must not call more than once
     int ret = M_FONTDATA->m_family;
     if (M_FONTDATA->HasNativeFont())
         // wxNativeFontInfo::GetFamily is expensive, must not call more than once


@@ -447,53 +430,41 @@ int wxFont::GetFamily() const
         ret = M_FONTDATA->m_family;
 
     return ret;
         ret = M_FONTDATA->m_family;
 
     return ret;

-#else
-    return M_FONTDATA->m_family;
-#endif

 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
                                        : M_FONTDATA->m_style;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
                                        : M_FONTDATA->m_style;

-#else
-    return M_FONTDATA->m_style;
-#endif

 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-#if wxUSE_PANGO

     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
                                        : M_FONTDATA->m_weight;
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
                                        : M_FONTDATA->m_weight;

-#else
-    return M_FONTDATA->m_weight;
-#endif

 }
 
 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->m_underlined;
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
 
     return M_FONTDATA->m_underlined;
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {

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

 
 

-    // m_encoding is unused in wxGTK2, return encoding that the user set.

     return M_FONTDATA->m_encoding;
 }
 
 bool wxFont::GetNoAntiAliasing() const
 {
     return M_FONTDATA->m_encoding;
 }
 
 bool wxFont::GetNoAntiAliasing() const
 {

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

 
     return M_FONTDATA->m_noAA;
 }
 
     return M_FONTDATA->m_noAA;
 }


@@ -507,7 +478,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 
 bool wxFont::IsFixedWidth() const
 {
 
 bool wxFont::IsFixedWidth() const
 {

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

 
     return wxFontBase::IsFixedWidth();
 }
 
     return wxFontBase::IsFixedWidth();
 }


@@ -518,63 +489,74 @@ bool wxFont::IsFixedWidth() const
 
 void wxFont::SetPointSize(int pointSize)
 {
 
 void wxFont::SetPointSize(int pointSize)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetPointSize(pointSize);
 }
 
 void wxFont::SetFamily(int family)
 {
 
     M_FONTDATA->SetPointSize(pointSize);
 }
 
 void wxFont::SetFamily(int family)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetFamily(family);
 }
 
 void wxFont::SetStyle(int style)
 {
 
     M_FONTDATA->SetFamily(family);
 }
 
 void wxFont::SetStyle(int style)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetStyle(style);
 }
 
 void wxFont::SetWeight(int weight)
 {
 
     M_FONTDATA->SetStyle(style);
 }
 
 void wxFont::SetWeight(int weight)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetWeight(weight);
 }
 
 
     M_FONTDATA->SetWeight(weight);
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
 {

-    Unshare();
+    AllocExclusive();

 
 

-    M_FONTDATA->SetFaceName(faceName);
+    return M_FONTDATA->SetFaceName(faceName) &&
+           wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 {
 }
 
 void wxFont::SetUnderlined(bool underlined)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetUnderlined(underlined);
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
 
     M_FONTDATA->SetUnderlined(underlined);
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetEncoding(encoding);
 }
 
 void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {
 
     M_FONTDATA->SetEncoding(encoding);
 }
 
 void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetNativeFontInfo( info );
 }
 
 void wxFont::SetNoAntiAliasing( bool no )
 {
 
     M_FONTDATA->SetNativeFontInfo( info );
 }
 
 void wxFont::SetNoAntiAliasing( bool no )
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->SetNoAntiAliasing( no );
 }
 
     M_FONTDATA->SetNoAntiAliasing( no );
 }

+
+wxObjectRefData* wxFont::CreateRefData() const
+{
+    return new wxFontRefData;
+}
+
+wxObjectRefData* wxFont::CloneRefData(const wxObjectRefData* data) const
+{
+    return new wxFontRefData(*wx_static_cast(const wxFontRefData*, data));
+}