X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..88594d02eb59a55ac85d3210a49d02918124617b:/src/mgl/font.cpp diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp index 26456824c7..ff9f73343d 100644 --- 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, Vaclav Slavik +// Copyright: (c) 2001 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" @@ -27,8 +34,6 @@ #include "wx/tokenzr.h" #include "wx/settings.h" -#include - // ---------------------------------------------------------------------------- // wxFontRefData // ---------------------------------------------------------------------------- @@ -125,6 +130,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 +139,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 +155,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, @@ -203,12 +205,6 @@ void wxFont::Unshare() } } -wxFont::~wxFont() -{ - if (wxTheFontList) - wxTheFontList->DeleteObject(this); -} - // ---------------------------------------------------------------------------- // accessors // ----------------------------------------------------------------------------