Tries to fix wxListBox focus problems.

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

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index 26456824c79e5a95eb81ffc4bcc590af62463cb0..cc8dd3fb38b87dd8fd77236be568177c94ca73b1 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -2,7 +2,7 @@
 // Name:        font.cpp
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -125,6 +125,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
     m_valid = data.m_valid;
     if ( m_library )
         m_library->IncRef();
     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,
 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,


@@ -133,10 +134,12 @@ wxFontRefData::wxFontRefData(int size, int family, int style,
                              wxFontEncoding encoding)
 {
     Init(size, family, style, weight, underlined, faceName, encoding);
                              wxFontEncoding encoding)
 {
     Init(size, family, style, weight, underlined, faceName, encoding);

+    wxLogTrace("mgl_font", "created fntrefdata %p, library is %p", this, m_library);

 }
 
 wxFontRefData::~wxFontRefData()
 {
 }
 
 wxFontRefData::~wxFontRefData()
 {

+    wxLogTrace("mgl_font", "destructing fntrefdata %p, library is %p", this, m_library);

     if ( m_library )
         m_library->DecRef();
 }
     if ( m_library )
         m_library->DecRef();
 }


@@ -147,12 +150,6 @@ wxFontRefData::~wxFontRefData()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
 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,
 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     return Create(info.pointSize, info.family, info.style, info.weight,


@@ -203,12 +200,6 @@ void wxFont::Unshare()
     }
 }
 
     }
 }
 

-wxFont::~wxFont()
-{
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);
-}
-

 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------