fixed crash under GTK+ 2.0

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

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index d46be6a92a8c51d7282b720a39cc79330711d279..e3ac9a29d20addb52e0c0c2109f733622e3f0e6b 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -2,7 +2,7 @@
 // Name:        font.cpp
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,6 +18,13 @@
     #pragma implementation "font.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
@@ -26,8 +33,7 @@
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
-
-#include <strings.h>
+#include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------
 // wxFontRefData
@@ -125,6 +131,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
     m_valid = data.m_valid;
     if ( m_library )
         m_library->IncRef();
+    wxLogTrace("mgl_font", "created fntrefdata %p, library is %p", this, m_library);
 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,
@@ -133,10 +140,12 @@ wxFontRefData::wxFontRefData(int size, int family, int style,
                              wxFontEncoding encoding)
 {
     Init(size, family, style, weight, underlined, faceName, encoding);
+    wxLogTrace("mgl_font", "created fntrefdata %p, library is %p", this, m_library);
 }
 
 wxFontRefData::~wxFontRefData()
 {
+    wxLogTrace("mgl_font", "destructing fntrefdata %p, library is %p", this, m_library);
     if ( m_library )
         m_library->DecRef();
 }
@@ -147,12 +156,6 @@ wxFontRefData::~wxFontRefData()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
-void wxFont::Init()
-{
-    if (wxTheFontList)
-        wxTheFontList->Append(this);
-}
-
 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     return Create(info.pointSize, info.family, info.style, info.weight,
@@ -189,26 +192,17 @@ struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)
     return instance->GetMGLfont_t();
 }
 
-void wxFont::Unshare()
+wxObjectRefData *wxFont::CreateRefData() const
 {
-    if ( !m_refData )
-    {
-        m_refData = new wxFontRefData();
-    }
-    else
-    {
-        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
+    return new wxFontRefData;
 }
 
-wxFont::~wxFont()
+wxObjectRefData *wxFont::CloneRefData(const wxObjectRefData *data) const
 {
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);
+    return new wxFontRefData(*(wxFontRefData *)data);
 }
 
+
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
@@ -263,6 +257,13 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+
+    return (bool)(M_FONTDATA->m_library->GetFamily()->GetInfo()->isFixed);
+}
+
 
 // ----------------------------------------------------------------------------
 // change font attributes
@@ -270,7 +271,7 @@ wxFontEncoding wxFont::GetEncoding() const
 
 void wxFont::SetPointSize(int pointSize)
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->m_pointSize = pointSize;
     M_FONTDATA->m_valid = FALSE;
@@ -278,7 +279,7 @@ void wxFont::SetPointSize(int pointSize)
 
 void wxFont::SetFamily(int family)
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_valid = FALSE;
@@ -286,7 +287,7 @@ void wxFont::SetFamily(int family)
 
 void wxFont::SetStyle(int style)
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_valid = FALSE;
@@ -294,7 +295,7 @@ void wxFont::SetStyle(int style)
 
 void wxFont::SetWeight(int weight)
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_valid = FALSE;
@@ -302,7 +303,7 @@ void wxFont::SetWeight(int weight)
 
 void wxFont::SetFaceName(const wxString& faceName)
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_valid = FALSE;
@@ -310,14 +311,14 @@ void wxFont::SetFaceName(const wxString& faceName)
 
 void wxFont::SetUnderlined(bool underlined)
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->m_underlined = underlined;
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->m_encoding = encoding;
     M_FONTDATA->m_valid = FALSE;